Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-up-local-change.out @ 1995:2da2d46862fb
Spelling fix: "commited" -> "committed"
author | mcmillen@cs.cmu.edu |
---|---|
date | Fri, 24 Mar 2006 14:53:23 +0100 |
parents | 7544700fd931 |
children | ced2d3620f95 |
comparison
equal
deleted
inserted
replaced
1994:78ef83c9e9e1 | 1995:2da2d46862fb |
---|---|
101 a (resolve) | 101 a (resolve) |
102 b (resolve) | 102 b (resolve) |
103 aborting update spanning branches! | 103 aborting update spanning branches! |
104 (use update -m to merge across branches or -C to lose changes) | 104 (use update -m to merge across branches or -C to lose changes) |
105 failed | 105 failed |
106 abort: outstanding uncommited changes | 106 abort: outstanding uncommitted changes |
107 failed | 107 failed |
108 resolving manifests | 108 resolving manifests |
109 force None allow 1 moddirstate True linear False | 109 force None allow 1 moddirstate True linear False |
110 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 | 110 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 |
111 a versions differ, resolve | 111 a versions differ, resolve |