On Fri, Mar 26, 2010 at 6:34 AM, Neal Kreitzinger <neal@xxxxxxxx> wrote: > In other words, when two people modify the same file in different places I > want the automerge results file, but I want the resulting file marked as > unmerged so the programmer can then run git-mergetool to review the merge > results. This also prevents the programmer from running git-commit > immediately after the automerge without reviewing the merge results. Can > "mark automerge of samefile as 'unmerged'" be done in git via config > settings or command options? What about merge with '--no-commit' option and than doing 'diff --cached'. You have option of still seeing what merged and decide to reset or commit. -- Dilip -- 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