diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-26 23:12:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 23:12:13 (GMT) |
| commit | 8371e91463d8d9507244952f1652f2c1e0779a84 (patch) | |
| tree | 46eaf0160d00528e42c8ffdd3ea8bec0a3821d12 /Documentation/git-mergetool.txt | |
| parent | 1f7a2abcc18ec1080905dc5cd59381f7ac1c8111 (diff) | |
| parent | e29bee19012d6aa4fb02dae727caa53947d9e39a (diff) | |
| download | git-8371e91463d8d9507244952f1652f2c1e0779a84.zip git-8371e91463d8d9507244952f1652f2c1e0779a84.tar.gz git-8371e91463d8d9507244952f1652f2c1e0779a84.tar.bz2 | |
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 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions