equal
deleted
inserted
replaced
82 file: e (state "u") |
82 file: e (state "u") |
83 local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "") |
83 local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "") |
84 ancestor path: e (node 0000000000000000000000000000000000000000) |
84 ancestor path: e (node 0000000000000000000000000000000000000000) |
85 other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) |
85 other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) |
86 extra: ancestorlinknode = 0000000000000000000000000000000000000000 |
86 extra: ancestorlinknode = 0000000000000000000000000000000000000000 |
|
87 extra: merged = yes |
87 $ hg resolve -l |
88 $ hg resolve -l |
88 U e |
89 U e |
89 |
90 |
90 insert unsupported mandatory merge record |
91 insert unsupported mandatory merge record |
91 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X |
92 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X |