diff options
Diffstat (limited to 'lib/option.tcl')
| -rw-r--r-- | lib/option.tcl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/option.tcl b/lib/option.tcl index 2d4b97b7d3..9b865f6a75 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -119,6 +119,7 @@ proc do_options {} { {b merge.summary {mc "Summarize Merge Commits"}} {i-1..5 merge.verbosity {mc "Merge Verbosity"}} {b merge.diffstat {mc "Show Diffstat After Merge"}} + {t merge.tool {mc "Use Merge Tool"}} {b gui.trustmtime {mc "Trust File Modification Timestamps"}} {b gui.pruneduringfetch {mc "Prune Tracking Branches During Fetch"}} |