equal
deleted
inserted
replaced
735 |
735 |
736 ... grafts of grafts unfortunately can't |
736 ... grafts of grafts unfortunately can't |
737 $ hg graft -q 13 --debug |
737 $ hg graft -q 13 --debug |
738 scanning for duplicate grafts |
738 scanning for duplicate grafts |
739 grafting 13:7a4785234d87 "2" |
739 grafting 13:7a4785234d87 "2" |
740 unmatched files new in both: |
|
741 b |
|
742 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
740 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
743 src: 'a' -> dst: 'b' * |
741 src: 'a' -> dst: 'b' * |
744 checking for directory renames |
742 checking for directory renames |
745 resolving manifests |
743 resolving manifests |
746 branchmerge: True, force: True, partial: False |
744 branchmerge: True, force: True, partial: False |