Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information