diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-03-13 16:19:35 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-13 23:43:56 -0700 |
| commit | 381b851c9b010147bb1fa83a013b7c8f60419026 (patch) | |
| tree | ec0e5f958344a99775c2ec82e755f9c9b50caa40 /Documentation/git-commit.txt | |
| parent | merge-recursive: handle file mode changes (diff) | |
| download | tgif-381b851c9b010147bb1fa83a013b7c8f60419026.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-commit.txt')
0 files changed, 0 insertions, 0 deletions