Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgmerge.1.txt @ 2217:f72c438ce08c
Fixed tests for changed help output
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 06 May 2006 16:43:16 +0200 |
parents | 3ab6e55ee361 |
children | 345bac2bc4ec |