git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2025-12-13 08:41:13 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity
1,753 Commits 15 Branches 1,097 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
Fredrik Kuivinen
d9a23fa6f7 [PATCH] Be more like the 'resolve' strategy. 
If there are non-mergeable changes leave the head contents in the
cache and update the working directory with the output from merge(1).

In the add/add and delete/modify conflict cases leave unmerged cache
entries in the index.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-13 15:45:23 -07:00
Fredrik Kuivinen
e4cf17ce0d [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. 
Otherwise we would regret when Fredrik comes up with another merge
algorithm with different pros-and-cons with the current one.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-13 00:20:54 -07:00