From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Sun, 2 Oct 2005 15:43:07 +0000 (+0200)
Subject: [PATCH] Teach the recursive merge strategy about renames.
X-Git-Tag: v0.99.8~5
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=af215114f52af0f308ef19f67e544df8ea5e4ac2;hp=af215114f52af0f308ef19f67e544df8ea5e4ac2;p=git.git

[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>
---