equal
deleted
inserted
replaced
87 with: [4] added c |
87 with: [4] added c |
88 base: [2] added c |
88 base: [2] added c |
89 updating to "local" side of the conflict: 0c9267e23c9d |
89 updating to "local" side of the conflict: 0c9267e23c9d |
90 merging "other" content-divergent changeset '6c06cda6dc99' |
90 merging "other" content-divergent changeset '6c06cda6dc99' |
91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92 working directory is now at 7d41fb83d892 |
92 working directory is now at 443bd2972210 |
93 |
93 |
94 Make sure resultant cset don't replace the initial user with user running the command: |
94 Make sure resultant cset don't replace the initial user with user running the command: |
95 $ hg log -r tip |
95 $ hg log -r tip |
96 changeset: 5:7d41fb83d892 |
96 changeset: 5:443bd2972210 |
97 tag: tip |
97 tag: tip |
98 parent: 1:1740ad2a1eda |
98 parent: 1:1740ad2a1eda |
99 user: bar <bar@test.com> |
99 user: foo <foo@test.com> |
100 date: Thu Jan 01 00:00:00 1970 +0000 |
100 date: Thu Jan 01 00:00:00 1970 +0000 |
101 summary: added c e |
101 summary: added c e |
102 |
102 |