equal
deleted
inserted
replaced
169 adding file changes |
169 adding file changes |
170 added 1 changesets with 1 changes to 1 files (+1 heads) |
170 added 1 changesets with 1 changes to 1 files (+1 heads) |
171 (run 'hg heads' to see heads, 'hg merge' to merge) |
171 (run 'hg heads' to see heads, 'hg merge' to merge) |
172 $ hg merge 2>/dev/null |
172 $ hg merge 2>/dev/null |
173 subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
173 subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
174 (M)erge, keep (l)ocal or keep (r)emote? m |
174 (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m |
175 pulling subrepo s from $TESTTMP/gitroot |
175 pulling subrepo s from $TESTTMP/gitroot |
176 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
176 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
177 (branch merge, don't forget to commit) |
177 (branch merge, don't forget to commit) |
178 $ hg st --subrepos s |
178 $ hg st --subrepos s |
179 A s/f |
179 A s/f |