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)
Earlier, it would error out while trying to read and/or writing them.
Now, calling merge-file with empty files is neither interesting nor
useful, but it is a bug that needed fixing.

Noticed by Clemens Buchacher.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
No differences found