equal
deleted
inserted
replaced
149 $ hg evolve --content-divergent |
149 $ hg evolve --content-divergent |
150 merge:[4] added c |
150 merge:[4] added c |
151 with: [5] updated c |
151 with: [5] updated c |
152 base: [2] added c |
152 base: [2] added c |
153 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
153 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
154 working directory is now at 85c4e0b92028 |
154 working directory is now at 202a770d8c1f |
155 |
155 |
156 $ hg log -r tip | grep "^user" |
156 $ hg log -r tip | grep "^user" |
157 user: baruser |
157 user: baruser, foouser |
158 |
158 |
159 $ cd .. |
159 $ cd .. |