Re: [git-users] conflicts and merges

2011-12-01 Thread David Aguilar
On Dec 1, 2011, at 8:05 PM, Rustom Mody wrote: As a git noob I am handling my first conflicts. I find the conflict-marker-ed files hard to decipher with the etc Is it possible to read the same information in emacs with ediff? I guess its related (or not dunno) how to grok 3 way m

[git-users] conflicts and merges

2011-12-01 Thread Rustom Mody
As a git noob I am handling my first conflicts. I find the conflict-marker-ed files hard to decipher with the etc 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