summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2018-10-24 12:25:37 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-25 14:01:16 +0900
commit57ba181270e07ba66c55c9af466e95ab9f739680 (patch)
tree2a5df8d3a5c9b5db4ff83a534f34168f28c1cf1c /t/t3309-notes-merge-auto-resolve.sh
parentmergetool: accept -g/--[no-]gui as arguments (diff)
downloadtgif-57ba181270e07ba66c55c9af466e95ab9f739680.tar.xz
completion: support `git mergetool --[no-]gui`
Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Anmol Mago <anmolmago@gmail.com> Signed-off-by: Brian Ho <briankyho@gmail.com> Signed-off-by: David Lu <david.lu97@outlook.com> Signed-off-by: Ryan Wang <shirui.wang@hotmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions