equal
deleted
inserted
replaced
80 $ hg resolve --mark b |
80 $ hg resolve --mark b |
81 (no more unresolved files) |
81 (no more unresolved files) |
82 continue: hg graft --continue |
82 continue: hg graft --continue |
83 $ hg graft --continue |
83 $ hg graft --continue |
84 grafting 1:5974126fad84 "b1" |
84 grafting 1:5974126fad84 "b1" |
85 warning: can't find ancestor for 'b' copied from 'a'! |
|
86 $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' |
85 $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' |
87 changeset: 3:376d30ccffc0 |
86 changeset: 3:376d30ccffc0 |
88 summary: b1 |
87 summary: b1 |
89 |
88 |
90 changeset: 2:416baaa2e5e4 |
89 changeset: 2:416baaa2e5e4 |