| commit | af215114f52af0f308ef19f67e544df8ea5e4ac2 | |
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Sun, 2 Oct 2005 15:43:07 +0000 (2 17:43 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 2 Oct 2005 17:03:00 +0000 (2 10:03 -0700) | ||
| tree | cb78a469c6215a070d676631048d8c658b6a23a9 | treesnapshot (tar.gz zip) |
| parent | 7dd43575f8641c8a73b1e976715056ebdc773904 | commitdiff |
[PATCH] Teach the recursive merge strategy about renames.
It will now merge cases where a file was renamed in one branch and
modified in the other branch cleanly. We also detect a couple of
conflict cases now that wasn't detected before.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
It will now merge cases where a file was renamed in one branch and
modified in the other branch cleanly. We also detect a couple of
conflict cases now that wasn't detected before.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-recursive.py | diffblobblamehistory |