merge-file: handle empty files gracefully
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Thu, 13 Mar 2008 15:19:35 +0000 (16:19 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2008 06:43:56 +0000 (23:43 -0700)
commit381b851...9b010147bb1fa83a013b7c8f60419026
treeec0e5f9...8344a99775c2ec82e755f9c9b50caa40copy hash to clipboard (tree)
parent1affea4...629537fd48e3bd66de89a6f45d0fcd82copy hash to clipboard (diff)
builtin-merge-file.c
xdiff-interface.c