# git citool/gui bug 2 messages from 2008-07-30 to 2008-07-31. Participants: Leandro Lucarella, Shawn O. Pearce. Thread: https://gitlist.dev/t/14764 ## Leandro Lucarella, 2008-07-30 18:53 Subject: git citool/gui bug Message-ID: <20080730185306.GV7616@integratech.com.ar> URL: https://gitlist.dev/e/20080730185306.GV7616%40integratech.com.ar ``` Hi! I think I've hit a really silly bug in citool/gui: 1) mkdir test; cd test 2) git init 3) vi test.txt # add content 4) cat test.txt =============== Hello World!!!! =============== 5) git citool 6) add the test.txt file to the index 7) see test.txt index diff git citool shows: new file mode 100644 # black @@ -0,0 +1,5 @@ # blue + # green =============== # orange +Hello World!!!! # green =============== # orange + # green Please Cc me, I'm not in the list. Thank you! -- Leandro Lucarella Integratech S.A. 4571-5252 ``` ## Shawn O. Pearce, 2008-07-31 03:23 Subject: Re: git citool/gui bug Message-ID: <20080731032337.GA1860@spearce.org> URL: https://gitlist.dev/e/20080731032337.GA1860%40spearce.org In-Reply-To: <20080730185306.GV7616@integratech.com.ar> ``` Leandro Lucarella wrote: > Hi! I think I've hit a really silly bug in citool/gui: > > git citool shows: > > new file mode 100644 # black > @@ -0,0 +1,5 @@ # blue > + # green > =============== # orange > +Hello World!!!! # green > =============== # orange > + # green Hmph. Don't put 7 = on a line together. Or 7 < or 7 > for that matter. It confuses some git related tools like git-rerere, the template pre-commit hook, and git-gui. In this case we think these are the lines between two hunks in a merge conflict, so we are showing them specially to you. Just in case you staged a conflicted hunk by accident during a merge you want it to stand out to help you notice the error. Yes, it would be nice if git-gui knew this wasn't actually a merge conflict but was instead proper text. Sadly it isn't that smart. -- Shawn. ```