diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-30 19:10:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-30 19:10:09 (GMT) |
| commit | 504c1942a9b9dc6dd440bd18730f55e947dd9ce1 (patch) | |
| tree | 9599b09ba2f2c6eff544c97557b0c9bf09675e29 /git-mergetool.sh | |
| parent | 0bfc7c10d865697cc59081a4bc55a3add4958be0 (diff) | |
| parent | 056f34bbcdda2f7f85858ed8414afbed99686758 (diff) | |
| download | git-504c1942a9b9dc6dd440bd18730f55e947dd9ce1.zip git-504c1942a9b9dc6dd440bd18730f55e947dd9ce1.tar.gz git-504c1942a9b9dc6dd440bd18730f55e947dd9ce1.tar.bz2 | |
Merge branch 'sg/t3600-nul-sha1-fix'
* sg/t3600-nul-sha1-fix:
t3600: fix broken "choking git rm" test
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions