diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-04 10:25:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-04 10:25:23 -0700 |
| commit | f54cb059b18e704d8b51d0cd4736344422650d6f (patch) | |
| tree | 324187d0682f989593a532d231acf8472d4d2f2b /t/t7605-merge-resolve.sh | |
| parent | Git 2.2.2 (diff) | |
| parent | show-branch: use a strbuf for reflog descriptions (diff) | |
| download | tgif-f54cb059b18e704d8b51d0cd4736344422650d6f.tar.xz | |
Merge branch 'jk/long-paths' into maint-2.2
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions