Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgmerge.1.txt @ 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 | c084cfbb2389 |
children | 3ab6e55ee361 |