equal
deleted
inserted
replaced
75 (hg histedit --continue to resume) |
75 (hg histedit --continue to resume) |
76 |
76 |
77 insert unsupported advisory merge record |
77 insert unsupported advisory merge record |
78 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x |
78 $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x |
79 $ hg debugmergestate |
79 $ hg debugmergestate |
80 local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 |
80 local (already edited): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 |
81 other (histedit): e860deea161a2f77de56603b340ebbb4536308ae |
81 other (current change): e860deea161a2f77de56603b340ebbb4536308ae |
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 |