diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-09-24 21:08:01 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-30 11:40:48 -0700 |
| commit | d3bcf55d675a255c00d2743c00978e1f42c93572 (patch) | |
| tree | 66a0cb90a94c98800bb1abd61975fd5ac7c4bd06 | |
| parent | ed70e4d7db69a66d833d1efe56606213bab807e1 (diff) | |
| download | git-d3bcf55d675a255c00d2743c00978e1f42c93572.tar.gz git-d3bcf55d675a255c00d2743c00978e1f42c93572.tar.xz | |
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>
| -rw-r--r-- | lib/mergetool.tcl | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 6ab5701d9..8d1ee5b11 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -375,14 +375,6 @@ proc merge_tool_finish {fd} { } } - # Check the modification time of the target file - if {!$failed && [file mtime $mtool_target] eq $mtool_mtime} { - if {[ask_popup [mc "File %s unchanged, still accept as resolved?" \ - [short_path $mtool_target]]] ne {yes}} { - set failed 1 - } - } - # Finish if {$failed} { file rename -force -- $backup $mtool_target @@ -395,6 +387,6 @@ proc merge_tool_finish {fd} { delete_temp_files $mtool_tmpfiles - merge_add_resolution $mtool_target + reshow_diff } } |