diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:33 -0800 |
| commit | f5a5531e4e08c22ff1c3f02c43954896b947b158 (patch) | |
| tree | 3a9f543e07f7a3db4151288a4be08204aa060da3 /Documentation/git-mergetool--lib.txt | |
| parent | Merge branch 'fc/apply-p2-get-header-name' (diff) | |
| parent | diff: don't presume empty file when corresponding object is missing (diff) | |
| download | tgif-f5a5531e4e08c22ff1c3f02c43954896b947b158.tar.xz | |
Merge branch 'np/diff-in-corrupt-repository'
* np/diff-in-corrupt-repository:
diff: don't presume empty file when corresponding object is missing
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions