diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-10 12:52:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-10 12:52:25 -0800 |
| commit | 163d24dc4d914191d1981ed0d9fa2a5d91b7d412 (patch) | |
| tree | 99efdce4c601aeca8dbeea4779a39e651c3b46fd /t/t6200-fmt-merge-msg.sh | |
| parent | Merge branch 'rs/p5302-create-repositories-before-tests' (diff) | |
| parent | t7800: simplify basic usage test (diff) | |
| download | tgif-163d24dc4d914191d1981ed0d9fa2a5d91b7d412.tar.xz | |
Merge branch 'js/difftool-builtin'
A few hot-fixes to C-rewrite of "git difftool".
* js/difftool-builtin:
t7800: simplify basic usage test
difftool: fix bug when printing usage
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
0 files changed, 0 insertions, 0 deletions