Fredrik Kuivinen af215114f5 [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>

2005-10-02 10:03:00 -07:00

28 KiB

Executable File

Raw Blame History

View Raw