Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > That is certainly a possibility! But how would you specify it? If you > do it as a command line option, you'd have to add it to git-merge, > git-pull, git-merge-recursive and git-merge-file. Ugly. Another thing to worry about is that this would make things "works most of the time but when it fails it fails silently" which would lead to very hard to detect problem in the project managed by git. I'd be very hesitant about this for this reason alone. - 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