tree 66a0cb90a94c98800bb1abd61975fd5ac7c4bd06
parent ed70e4d7db69a66d833d1efe56606213bab807e1
author Johannes Sixt <johannes.sixt@telecom.at> 1222283281 +0200
committer Shawn O. Pearce <spearce@spearce.org> 1222800048 -0700

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>