| commit | a97e4075a16e0cbdf9c4aed736b5e762e035508b | |
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Sat, 31 Mar 2007 11:49:38 +0000 (31 13:49 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 31 Mar 2007 20:39:15 +0000 (31 13:39 -0700) | ||
| tree | 30442b95bf257bff9c7356629b81f93fb7b6c93e | treesnapshot (tar.gz zip) |
| parent | 4f01748d51b530c297eeb5a0ece9af923d5db937 | commitdiff |
Keep rename/rename conflicts of intermediate merges while doing recursive merge
This patch leaves the base name in the resulting intermediate tree, to
propagate the conflict from intermediate merges up to the top-level merge.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This patch leaves the base name in the resulting intermediate tree, to
propagate the conflict from intermediate merges up to the top-level merge.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |