diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mergetool.tcl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 79c58bc7bc..dd2315b858 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -5,6 +5,12 @@ proc merge_resolve_one {stage} { global current_diff_path switch -- $stage { + 0 { # Stage without confirmation, to minimize + # disruption of the rerere workflow + merge_add_resolution $current_diff_path + return + } + 1 { set target [mc "the base version"] } 2 { set target [mc "this branch"] } 3 { set target [mc "the other branch"] } |