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?

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
To unsubscribe from this group, send email to
For more options, visit this group at

Reply via email to