Catalin Marinas <catalin.marinas@xxxxxxxxx> wrote: > One nice addition to git-merge-recursive (probably only useful to > StGIT) would be more meaningful labeling of the conflict regions, > passed via a command line similar to the "diff3 -L" option. StGIT > generates "patched", "current" and "ancestor" labels with diff3. Indeed. Getting a SHA1 hash of the branch that I merged in by name with "git merge foof" is horrible UI. I want to see "foof" in the conflict. Its in my list of things I'd really like to fix, but is currently low priority compared to the issues I've run into this past week with git-merge-recursive's basic functions. On the other hand Git's open source strategy is really paying off on resolving those problems, typically the issue is fixed and accepted by Junio into 'next' in under a day of identification. :-) -- 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