Alexander Gavrilov <angavrilov@xxxxxxxxx> wrote: > On Wed, Sep 17, 2008 at 3:40 PM, Johannes Sixt <johannes.sixt@xxxxxxxxxx> wrote: > > 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. > > It completely reproduces the logic that git-mergetool uses. Namely, if > the file is unchanged, it asks explicitly, and if the tool returns a > non-zero exit code, it does not stage at all. > > You also cannot simply remove merge_add_resolution, because then it > would leave the diff view stale. Is it just a matter of calling reshow_diff instead? -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
