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? 
Also should not show conflict in case of git merge. 

Any suggestions?

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.

Reply via email to