diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:52:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:52:04 -0700 |
| commit | b22d301b24b55dc59549833d285decbdd9b1ca53 (patch) | |
| tree | 2841295804d56eb193bc8f2bb3aac628fe3b577d /builtin/merge-tree.c | |
| parent | Merge branch 'zj/test-cred-helper-nicer-prove' (diff) | |
| parent | t7800: Test difftool passing arguments to diff (diff) | |
| download | tgif-b22d301b24b55dc59549833d285decbdd9b1ca53.tar.xz | |
Merge branch 'da/difftool-test'
Makes sure "difftool" options can be given in any order.
By David Aguilar
* da/difftool-test:
t7800: Test difftool passing arguments to diff
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions