Code

git-gui: Do not automatically stage file after merge tool finishes
authorJohannes Sixt <johannes.sixt@telecom.at>
Wed, 24 Sep 2008 19:08:01 +0000 (21:08 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 30 Sep 2008 18:40:48 +0000 (11:40 -0700)
commitd3bcf55d675a255c00d2743c00978e1f42c93572
tree66a0cb90a94c98800bb1abd61975fd5ac7c4bd06
parented70e4d7db69a66d833d1efe56606213bab807e1
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>
lib/mergetool.tcl