diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-07 13:40:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-07 13:40:19 -0700 |
| commit | 9181365b856a63f8c5486ad0fe48f1cd60852da3 (patch) | |
| tree | d63ffbda006ba157679e7e25e0f2e331ad9897a0 /xdiff/xmerge.c | |
| parent | Merge branch 'maint-1.8.5' into maint-1.9 (diff) | |
| parent | git-tag.txt: Add a missing hyphen to `-s` (diff) | |
| download | tgif-9181365b856a63f8c5486ad0fe48f1cd60852da3.tar.xz | |
Merge branch 'maint-1.8.5' into maint-1.9
* maint-1.8.5:
git-tag.txt: Add a missing hyphen to `-s`
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions