On 0, David Aguilar <davvid@xxxxxxxxx> wrote: > > Regarding ecmerge: I found the --mode=diff2 > flag by reading their documenation: > > http://www.elliecomputing.com/OnlineDoc/ecmerge_EN/52335623.asp > > I don't have ecmerge installed at all, so I'm just > going by the book on this one. It *looks* correct, > and probably is, but let it be known that I > haven't tested the ecmerge snippet myself. I installed ecmerge on a mac today and gave this a try. ecmerge is indeed better with this patch. After configuring the path it all "just works": $ git config --global mergetool.ecmerge.path \ /Applications/ECMerge.app/Contents/MacOS/guimerge We now get a simple side-by-side diff without the merge pane at the bottom of the screen. Nice. If an emacs user could comment on the emerge snippet below (or perhaps suggest a better one ;)) then that would make me happy. As is, I have tested the emacs emerge snippet and it works, but I'm not sure if that's enough to resolve the issue reported by Marcin. Marcin? Here's the original thread: http://article.gmane.org/gmane.comp.version-control.git/117930 > diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh > index a16a279..8b5e6a8 100644 > --- a/git-mergetool--lib.sh > +++ b/git-mergetool--lib.sh > @@ -248,7 +248,7 @@ run_merge_tool () { > status=$? > else > "$merge_tool_path" -f emerge-files-command \ > - "$LOCAL" "$REMOTE" "$(basename "$MERGED")" > + "$LOCAL" "$REMOTE" > fi > ;; -- David -- 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