diff options
| author |  David Aguilar <davvid@gmail.com> | 2016-10-07 17:01:30 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-10-11 10:04:31 -0700 |
| commit | 654311bf6ee0fbf530c088271c2c76d46f31f82d (patch) | |
| tree | a9139ebc933c04178ec29f99143b7a9c624a5ec0 /git-gui/lib/merge.tcl | |
| parent | mergetool: honor diff.orderFile (diff) | |
| download | tgif-654311bf6ee0fbf530c088271c2c76d46f31f82d.tar.xz | |
mergetool: honor -O<orderfile>
Teach mergetool to pass "-O<orderfile>" down to `git diff` when
specified on the command-line.
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions