Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 2060:676f5fd84a94
Don't use -u option for diff on SunOS, too.
This makes the tests work without using GNU diff on Solaris 8.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 12 Apr 2006 17:57:44 +0200 |
parents | 6a03cff2b0f5 |
children | e4480f2b61e9 |
comparison
equal
deleted
inserted
replaced
2059:a4c271765415 | 2060:676f5fd84a94 |
---|