projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from:
d9a23fa
)
[PATCH] Be more like the 'resolve' strategy.
author
Fredrik Kuivinen
<freku045@student.liu.se>
Tue, 13 Sep 2005 21:39:34 +0000
(23:39 +0200)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 13 Sep 2005 22:45:23 +0000
(15:45 -0700)
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>
No differences found