projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7dd4357) | patch
[PATCH] Teach the recursive merge strategy about renames.
authorFredrik Kuivinen <freku045@student.liu.se>
Sun, 2 Oct 2005 15:43:07 +0000 (17:43 +0200)
committerJunio C Hamano <junkio@cox.net>
Sun, 2 Oct 2005 17:03:00 +0000 (10:03 -0700)
commitaf215114f52af0f308ef19f67e544df8ea5e4ac2
treecb78a469c6215a070d676631048d8c658b6a23a9tree | snapshot
parent7dd43575f8641c8a73b1e976715056ebdc773904commit | diff
[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>
git-merge-recursive.py diff | blob | history
The core git plumbing