summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-10-02 15:43:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-02 17:03:00 (GMT)
commitaf215114f52af0f308ef19f67e544df8ea5e4ac2 (patch)
treecb78a469c6215a070d676631048d8c658b6a23a9 /t
parent7dd43575f8641c8a73b1e976715056ebdc773904 (diff)
downloadgit-af215114f52af0f308ef19f67e544df8ea5e4ac2.zip
git-af215114f52af0f308ef19f67e544df8ea5e4ac2.tar.gz
git-af215114f52af0f308ef19f67e544df8ea5e4ac2.tar.bz2
[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>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions