diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-31 13:51:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-31 13:51:06 -0700 |
| commit | 42dbdef1cac298c3faaab389b67a41005022fdfa (patch) | |
| tree | 8ffc0063c316b8ae8ba4d8aefc32428533d435de /xdiff/xmerge.c | |
| parent | Merge branch 'pw/unquote-path-in-git-pm' into maint (diff) | |
| parent | t: handle EOF in test_copy_bytes() (diff) | |
| download | tgif-42dbdef1cac298c3faaab389b67a41005022fdfa.tar.xz | |
Merge branch 'jk/test-copy-bytes-fix' into maint
A test fix.
* jk/test-copy-bytes-fix:
t: handle EOF in test_copy_bytes()
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions