diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-21 14:30:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-21 14:30:47 -0800 |
| commit | 3f246b1cef2c568bbac1f71c25fbf8045ff6448a (patch) | |
| tree | 2e74ff53dcb8a089c408b264895d8239e24e2d5d /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'jk/maint-decorate-01-bool' (diff) | |
| parent | t2107: mark passing test as success (diff) | |
| download | tgif-3f246b1cef2c568bbac1f71c25fbf8045ff6448a.tar.xz | |
Merge branch 'jk/t2107-now-passes'
* jk/t2107-now-passes:
t2107: mark passing test as success
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions