equal
deleted
inserted
replaced
756 checking for directory renames |
756 checking for directory renames |
757 resolving manifests |
757 resolving manifests |
758 branchmerge: True, force: True, partial: False |
758 branchmerge: True, force: True, partial: False |
759 ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 |
759 ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 |
760 starting 4 threads for background file closing (?) |
760 starting 4 threads for background file closing (?) |
|
761 nothing to commit, clearing merge state |
761 note: graft of 13:7a4785234d87 created no changes to commit |
762 note: graft of 13:7a4785234d87 created no changes to commit |
762 $ hg log -r 'destination(13)' |
763 $ hg log -r 'destination(13)' |
763 All copies of a cset |
764 All copies of a cset |
764 $ hg log -r 'origin(13) or destination(origin(13))' |
765 $ hg log -r 'origin(13) or destination(origin(13))' |
765 changeset: 2:5c095ad7e90f |
766 changeset: 2:5c095ad7e90f |