diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:26:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-22 10:26:34 -0700 |
| commit | ef937140a602bccea6f36235f1f7f926a90b85f2 (patch) | |
| tree | d90b28a68619fba6c32d2b1ff2f43b0f0518c991 /builtin/merge-file.c | |
| parent | Merge branch 'jm/doc-wording-tweaks' into maint (diff) | |
| parent | t5000, t5003: do not use test_cmp to compare binary files (diff) | |
| download | tgif-ef937140a602bccea6f36235f1f7f926a90b85f2.tar.xz | |
Merge branch 'sk/test-cmp-bin' into maint
* sk/test-cmp-bin:
t5000, t5003: do not use test_cmp to compare binary files
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions