From: Johannes Schindelin Date: Thu, 13 Mar 2008 15:19:35 +0000 (+0100) Subject: merge-file: handle empty files gracefully X-Git-Tag: v1.5.5-rc0~17^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/381b851c9b010147bb1fa83a013b7c8f60419026?hp=381b851c9b010147bb1fa83a013b7c8f60419026 merge-file: handle empty files gracefully 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 ---