diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:45 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:31 -0800 |
| commit | 6fc944d8956bf75bf2e52a871c02b71b4f9dfcba (patch) | |
| tree | f14539c4165b7440c969453102f8f5c55e8be020 /git-gui/lib/mergetool.tcl | |
| parent | t4013: add tests for -m failing to override -c/--cc (diff) | |
| download | tgif-6fc944d8956bf75bf2e52a871c02b71b4f9dfcba.tar.xz | |
diff-merges: fix -m to properly override -c/--cc
Logically, -m, -c, --cc specify 3 different formats for representing
merge commits, yet -m doesn't in fact override -c or --cc, that makes
no sense.
Fix -m to properly override -c/--cc, and change the tests accordingly.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions