[PATCH] Teach the recursive merge strategy about renames. · git-mirror/git@af21511 · GitHub

Commit

[PATCH] Teach the recursive merge strategy about renames.

Browse files

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>

Loading branch information

Fredrik Kuivinen authored and Junio C Hamano committed Oct 2, 2005

1 parent 7dd4357 commit af21511