equal
deleted
inserted
replaced
135 (branch merge, don't forget to commit) |
135 (branch merge, don't forget to commit) |
136 $ chmod +x b |
136 $ chmod +x b |
137 $ hg ci --debug -m merge |
137 $ hg ci --debug -m merge |
138 committing files: |
138 committing files: |
139 b |
139 b |
140 reusing manifest form p1 (listed files actually unchanged) |
140 reusing manifest from p1 (listed files actually unchanged) |
141 committing changelog |
141 committing changelog |
142 updating the branch cache |
142 updating the branch cache |
143 committed changeset 3:c8d50407916ef8a5a97cb6e36ca9bc844a6ee13e |
143 committed changeset 3:c8d50407916ef8a5a97cb6e36ca9bc844a6ee13e |
144 $ hg log -GTl |
144 $ hg log -GTl |
145 @ 3:c8d50407916e p=2,1 m=2:36b69ba4b24b f=[] |
145 @ 3:c8d50407916e p=2,1 m=2:36b69ba4b24b f=[] |