Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.out @ 2614:8ba1c31f6864
backout: allow backout of merge changeset with --parent option.
--parent allows to choose which parent of merge to revert to.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Fri, 14 Jul 2006 23:19:15 -0700 |
| parents | b2ae81a7df29 |
| children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)