Unexpected git diff output during merge conflict

Hi, I have a merge conflict on a file and the git diff output looks wrong to me. Here's how to recreate: On branch 'dev' add/commit a file (called README.md) with the contents ( '--' used to delimit the file, not included in the content): --- This is my default readme --- On branc

Re: Unexpected git diff output during merge conflict

Feb 08, 2018 at 10:51:57AM +, Nick O'Leary wrote: > >> $ git diff README.md >> diff --cc README.md >> index 61d78b2,620d806..000 >> --- a/README.md >> +++ b/README.md >> @@@ -1,7 -1,1 +1,11 @@@ >> -This i