Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 2283:e506c14382fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecate 'update -m'. use 'merge' instead.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 14 May 2006 21:07:34 -0700
parents 4e35843b2683
children bb403d427974
comparison
equal deleted inserted replaced
2282:2efa636eb411 2283:e506c14382fd
110 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) 110 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
111 failed 111 failed
112 abort: outstanding uncommitted changes 112 abort: outstanding uncommitted changes
113 failed 113 failed
114 resolving manifests 114 resolving manifests
115 force None allow 1 moddirstate True linear False 115 force False allow True moddirstate True linear False
116 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 116 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
117 a versions differ, resolve 117 a versions differ, resolve
118 b versions differ, resolve 118 b versions differ, resolve
119 merging a 119 merging a
120 resolving a 120 resolving a