projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 15bf57a) | patch
merge-recursive: match the unmerged index entry behaviour with merge-resolve
authorJunio C Hamano <junkio@cox.net>
Wed, 30 Nov 2005 10:37:06 +0000 (02:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 30 Nov 2005 10:37:06 +0000 (02:37 -0800)
commit58cce8a85da745e20c9527c569a0e0935ff3ab30
treeaa034aa4715069a0e3abe08628bc4393eaa34a61tree | snapshot
parent15bf57a18aaf10c038e2026dfe54281edbb6080acommit | diff
merge-recursive: match the unmerged index entry behaviour with merge-resolve

This minimally changes merge-recursive to match what happens
when O->A, O->B, A!=B 3-way filelevel merge leaves conflicts to
the new merge-resolve behaviour.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py diff | blob | history
The core git plumbing