git-gui: Support more merge tools.

diff --git a/lib/commit.tcl b/lib/commit.tcl
index 40a710355751836e78b65101592b753266f507ca..f4ab70784c9beb3b155bc27e41a9f7d483ec6708 100644 (file)
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -149,6 +149,7 @@ The rescan will be automatically started now.
                _? {continue}
                A? -
                D? -
+               T_ -
                M? {set files_ready 1}
                U? {
                        error_popup [mc "Unmerged files cannot be committed.
@@ -428,6 +429,7 @@ A rescan will be automatically started now.
                __ -
                A_ -
                M_ -
+               T_ -
                D_ {
                        unset file_states($path)
                        catch {unset selected_paths($path)}