| commit | 1cd12926cedb340d176db607e087495381032ce2 | |
| author | Charles Bailey <charles@hashpling.org> | |
| Mon, 25 May 2009 00:21:13 +0000 (25 01:21 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 May 2009 06:46:03 +0000 (24 23:46 -0700) | ||
| tree | 26be56f1edc505f3a48b779a6b5572d8245d32ba | treesnapshot (tar.gz zip) |
| parent | 6589ebf107214a9e6db31764e847301f1adebc81 | commitdiff |
t6023: merge-file fails to output anything for a degenerate merge
In the case that merge-file is passed three files with identical
contents it wipes the contents of the output file instead of
leaving it unchanged.
Althought merge-file is porcelain and this will never happen in
normal usage, it is still wrong.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In the case that merge-file is passed three files with identical
contents it wipes the contents of the output file instead of
leaving it unchanged.
Althought merge-file is porcelain and this will never happen in
normal usage, it is still wrong.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6023-merge-file.sh | diffblobblamehistory |