equal
deleted
inserted
replaced
277 with: [6] updated e |
277 with: [6] updated e |
278 base: [4] added e |
278 base: [4] added e |
279 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be |
279 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be |
280 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be |
280 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be |
281 file 'd' was deleted in local but was modified in other. |
281 file 'd' was deleted in local but was modified in other. |
282 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
282 What do you want to do? |
283 What do you want to do? c |
283 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
284 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
284 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
285 working directory is now at eb6357cd41b6 |
285 working directory is now at eb6357cd41b6 |
286 |
286 |
287 $ hg glog -l1 |
287 $ hg glog -l1 |
288 @ 9:eb6357cd41b6 updated e |
288 @ 9:eb6357cd41b6 updated e |