git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1affea4)
merge-file: handle empty files gracefully
authorJohannes Schindelin <redacted>
Thu, 13 Mar 2008 15:19:35 +0000 (16:19 +0100)
committerJunio C Hamano <redacted>
Fri, 14 Mar 2008 06:43:56 +0000 (23:43 -0700)
commit381b851c9b010147bb1fa83a013b7c8f60419026
treeec0e5f958344a99775c2ec82e755f9c9b50caa40tree | snapshot
parent1affea4f629537fd48e3bd66de89a6f45d0fcd82commit | diff
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 <redacted>
builtin-merge-file.c diff | blob | history
xdiff-interface.c diff | blob | history
git clone https://git.99rst.org/PROJECT