Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge3 @ 1105:a906b018eaef
Replaced hg status -p/--strip with -n/--no-status to not confuse with patch.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 27 Aug 2005 23:23:32 +0200 |
parents | 0902ffece4b4 |
children | 7544700fd931 |