Mercurial > hg > mercurial-crew-with-dirclash
comparison doc/ja/hgmerge.1.ja.txt @ 1571:bcdc030c59f8
add a --switch-parent option to export against the other parent
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 14 Dec 2005 21:01:57 -0600 |
| parents | 874efc57e00a |
| children | 345bac2bc4ec |
comparison
equal
deleted
inserted
replaced
| 1570:6a104941d56a | 1571:bcdc030c59f8 |
|---|