![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 30 Nov 2005 10:37:06 +0000 (02:37 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 30 Nov 2005 10:37:06 +0000 (02:37 -0800) | ||
| commit | 58cce8a85da745e20c9527c569a0e0935ff3ab30 | |
| tree | aa034aa4715069a0e3abe08628bc4393eaa34a61 | tree | snapshot |
| parent | 15bf57a18aaf10c038e2026dfe54281edbb6080a | commit | 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>
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 |