On Dec 1, 2011, at 8:05 PM, Rustom Mody <rustompm...@gmail.com> wrote:
As a git noob I am handling my first conflicts.
I find the conflict-marker-ed files hard to decipher
with the <<<<
Is it possible to read the same information in emacs with ediff?
I guess its related (or not dunno) how to grok 3 way merge?
git mergetool -t emerge
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to firstname.lastname@example.org.
To unsubscribe from this group, send email to
For more options, visit this group at