diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:18:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:18:19 -0800 |
| commit | 5d268edff8a271fe68f525e8d382a13b96c71a81 (patch) | |
| tree | 58a610f4a1bed6d647c824617d6a95236f99999d /git-mergetool.sh | |
| parent | Documentation/git-pull: clarify configuration (diff) | |
| parent | t3402: test "rebase -s<strategy> -X<opt>" (diff) | |
| download | tgif-5d268edff8a271fe68f525e8d382a13b96c71a81.tar.xz | |
Merge branch 'mz/maint-rebase-X-fix' into maint
* mz/maint-rebase-X-fix:
t3402: test "rebase -s<strategy> -X<opt>"
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions