t6023: merge-file fails to output anything for a degenerate merge
authorCharles Bailey <charles@hashpling.org>
Mon, 25 May 2009 00:21:13 +0000 (01:21 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2009 06:46:03 +0000 (23:46 -0700)
commit1cd1292...cedb340d176db607e087495381032ce2
tree26be56f...edc505f3a48b779a6b5572d8245d32bacopy hash to clipboard (tree)
parent6589ebf...07214a9e6db31764e847301f1adebc81copy hash to clipboard (diff)
t/t6023-merge-file.sh