diff options
| author |  David Aguilar <davvid@gmail.com> | 2014-10-15 01:35:18 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-10-15 13:48:15 -0700 |
| commit | 4756c05741164a0889212f1e8151ff081b75bba2 (patch) | |
| tree | 8734a811be833562a572e3b1b1853f6bc1f1f16f /Documentation/git-merge-tree.txt | |
| parent | t7610-mergetool: use tabs instead of a mix of tabs and spaces (diff) | |
| download | tgif-4756c05741164a0889212f1e8151ff081b75bba2.tar.xz | |
t7610-mergetool: add missing && and remove commented-out code
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions