On Tuesday 30 September 2008 10:43:11 Johannes Sixt wrote: > From: Johannes Sixt <johannes.sixt@xxxxxxxxxx> > > 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. > > Since the file is not staged anyway, the check for an unmodified > timestamp is pointless and removed. > > Signed-off-by: Johannes Sixt <johannes.sixt@xxxxxxxxxx> > --- > I had sent this patch last week (but marked as RFC). Here it is again > without 'RFC' because I think it is a necessary change. Now that the issue with staging of working copy files is more or less resolved, I agree that it is better to disable automatic staging. Alexander -- 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
