| commit | 0d5e6c9781aae33795243452fd50663d17ec2b9d | |
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Thu, 26 Apr 2007 19:13:49 +0000 (26 21:13 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 26 Apr 2007 23:11:39 +0000 (26 16:11 -0700) | ||
| tree | 0448c4e964b66fe838c83f60b38f01464c9c9547 | treesnapshot (tar.gz zip) |
| parent | 8a359819273a4460d5806d2d5e76cd7993a84843 | commitdiff |
Ignore merged status of the file-level merge
as it is not relevant for whether the result should be written.
Even if no real merge happened, there might be _no_ reason to
rewrite the working tree file. Maybe even more so.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
as it is not relevant for whether the result should be written.
Even if no real merge happened, there might be _no_ reason to
rewrite the working tree file. Maybe even more so.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |