On Wed, Jul 01, 2015 at 06:37:12AM -0700, Konrád Lőrinczi wrote:
> I have two branches and the only difference between them is the cvs
> $id$, which is expanded in one branch and not expanded in the other. 
> Is there a way to show git diff as unchanged? 

Not out of the box.  You could do some filtering using attributes.

> Also should not show conflict in case of git merge. 
> Any suggestions?

Remove the it!  If you aren't using CVS those lines serve no purpose
at all.  Even if you do use CVS the line is of dubious usefulness.


Magnus Therning                      OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe               http://therning.org/magnus

Eagles may soar, but weasels don't get sucked into jet engines.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Attachment: signature.asc
Description: PGP signature

Reply via email to