git-gui: Do not automatically stage file after merge tool finishes
If a merge tool was invoked on a conflicted file and the tool completed, then the conflicted file was staged automatically. However, the fact that the user closed the merge tool cannot be understood as the unequivocal sign that the conflict was completely resolved. For example, the user could have decided to postpone the resolution of the conflict, or could have accidentally closed the tool. We better leave the file unstaged and let the user stage it explicitly. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Johannes Sixt committed
Sep 24, 2008 at 21:08 UTC
d3bcf55d675a255c00d2743c00978e1f42c93572
1 file changed
+1
-9
lib/mergetool.tcl
+1
-9
@@ -375,14 +375,6 @@ proc merge_tool_finish {fd} {
375
}
376
}
377
378
- # Check the modification time of the target file
379
- if {!$failed && [file mtime $mtool_target] eq $mtool_mtime} {
380
- if {[ask_popup [mc "File %s unchanged, still accept as resolved?" \
381
- [short_path $mtool_target]]] ne {yes}} {
382
- set failed 1
383
- }
384
- }
385
-
378
# Finish
379
if {$failed} {
380
file rename -force -- $backup $mtool_target
@@ -395,6 +387,6 @@ proc merge_tool_finish {fd} {
387
388
delete_temp_files $mtool_tmpfiles
389
398
- merge_add_resolution $mtool_target
390
+ reshow_diff
391
}
392
}