1073 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 |
1073 rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514 |
1074 updating to "local" side of the conflict: c04ff147ef79 |
1074 updating to "local" side of the conflict: c04ff147ef79 |
1075 merging "other" content-divergent changeset '186bdc2cdfa2' |
1075 merging "other" content-divergent changeset '186bdc2cdfa2' |
1076 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1076 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1077 6 new orphan changesets |
1077 6 new orphan changesets |
1078 merge:[6] added b |
1078 merge:[11] added b |
1079 with: [11] added b |
1079 with: [6] added b |
1080 base: [2] added b |
1080 base: [2] added b |
1081 updating to "local" side of the conflict: d5f148423c16 |
1081 rebasing "other" content-divergent changeset d5f148423c16 on c04ff147ef79 |
1082 merging "other" content-divergent changeset '6eb54b5af3fb' |
1082 updating to "local" side of the conflict: 6eb54b5af3fb |
1083 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1083 merging "other" content-divergent changeset '8542f15656e7' |
1084 merge:[7] added c |
1084 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1085 with: [12] added c |
1085 merge:[12] added c |
|
1086 with: [7] added c |
1086 base: [3] added c |
1087 base: [3] added c |
1087 updating to "local" side of the conflict: 3ce4be6d8e5e |
1088 rebasing "other" content-divergent changeset 3ce4be6d8e5e on 6eb54b5af3fb |
1088 merging "other" content-divergent changeset '8ed612937375' |
1089 updating to "local" side of the conflict: 8ed612937375 |
1089 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1090 merging "other" content-divergent changeset 'a690ce53104a' |
1090 merge:[8] added d |
1091 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1091 with: [13] added d |
1092 merge:[13] added d |
|
1093 with: [8] added d |
1092 base: [4] added d |
1094 base: [4] added d |
1093 updating to "local" side of the conflict: c72d2885eb51 |
1095 rebasing "other" content-divergent changeset c72d2885eb51 on 8ed612937375 |
1094 merging "other" content-divergent changeset 'd45f050514c2' |
1096 updating to "local" side of the conflict: d45f050514c2 |
1095 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1097 merging "other" content-divergent changeset '1d1772990a3b' |
1096 working directory is now at c8f73c376a6e |
1098 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1097 |
1099 working directory is now at 5f7a38bdb75c |
1098 $ hg glog |
1100 |
1099 @ 18:c8f73c376a6e added d |
1101 $ hg glog |
1100 | () [default] draft |
1102 @ 21:5f7a38bdb75c added d |
1101 o 17:77126af93a25 added c |
1103 | () [default] draft |
1102 | () [default] draft |
1104 o 19:9865d598f0e0 added c |
1103 o 16:4e29776e83a5 added b |
1105 | () [default] draft |
|
1106 o 17:ac70b8c8eb63 added b |
1104 | () [default] draft |
1107 | () [default] draft |
1105 o 15:74fbf3e6a0b6 watbar to a |
1108 o 15:74fbf3e6a0b6 watbar to a |
1106 | () [default] draft |
1109 | () [default] draft |
1107 o 9:2228e3b74514 add newfile |
1110 o 9:2228e3b74514 add newfile |
1108 | () [default] draft |
1111 | () [default] draft |