If two subsequent lines are changed in different branches, merging will result in conflict event if there isn't any. Invoking merge tool will mark file as resolved automatically. Is there a way to disable this behavior ? I want the merge to happen automatically if possible. -- 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