diff options
| -rwxr-xr-x | git-gui.sh | 5 | ||||
| -rw-r--r-- | lib/mergetool.tcl | 6 |
2 files changed, 11 insertions, 0 deletions
@@ -2902,6 +2902,11 @@ $ctxmmg add command \ -command {merge_resolve_one 1} lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] $ctxmmg add separator +$ctxmmg add command \ + -label [mc "Stage Working Copy"] \ + -command {merge_resolve_one 0} +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state] +$ctxmmg add separator create_common_diff_popup $ctxmmg proc popup_diff_menu {ctxm ctxmmg x y X Y} { diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 79c58bc..dd2315b 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"] } |