Mercurial > public > mercurial-scm > hg
diff hgmerge @ 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 | 9c918287d10b |
children | 696851b1bba9 |