diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:13 -0700 |
| commit | 8371e91463d8d9507244952f1652f2c1e0779a84 (patch) | |
| tree | 46eaf0160d00528e42c8ffdd3ea8bec0a3821d12 /git-merge-resolve.sh | |
| parent | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6 (diff) | |
| parent | t9159-*.sh: skip for mergeinfo test for svn <= 1.4 (diff) | |
| download | tgif-8371e91463d8d9507244952f1652f2c1e0779a84.tar.xz | |
Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6
* rj/maint-t9159-svn-rev-notation:
t9159-*.sh: skip for mergeinfo test for svn <= 1.4
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions