diff options
| author | Charles Bailey <charles@hashpling.org> | 2009-05-25 01:21:13 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-24 23:46:03 -0700 |
| commit | 1cd12926cedb340d176db607e087495381032ce2 (patch) | |
| tree | 26be56f1edc505f3a48b779a6b5572d8245d32ba /xdiff | |
| parent | 6589ebf107214a9e6db31764e847301f1adebc81 (diff) | |
| download | git-1cd12926cedb340d176db607e087495381032ce2.tar.gz git-1cd12926cedb340d176db607e087495381032ce2.tar.xz | |
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>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions