| commit | 381b851c9b010147bb1fa83a013b7c8f60419026 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Thu, 13 Mar 2008 15:19:35 +0000 (13 16:19 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2008 06:43:56 +0000 (13 23:43 -0700) | ||
| tree | ec0e5f958344a99775c2ec82e755f9c9b50caa40 | treesnapshot (tar.gz zip) |
| parent | 1affea4f629537fd48e3bd66de89a6f45d0fcd82 | commitdiff |
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 <johannes.schindelin@gmx.de>
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>
| builtin-merge-file.c | diffblobblamehistory | |
| xdiff-interface.c | diffblobblamehistory |