Mercurial > hg

comparison tests/test-resolve.t @ 26352:e635bc9bb7d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: consistently describe re-merge + unresolved
author timeless@mozdev.org
date Fri, 25 Sep 2015 03:51:46 -0400
parents 4cb8002658d6
children ef1eb6df7071
comparison
equal deleted inserted replaced
26351:8c7d8d5e1e0f 26352:e635bc9bb7d9
127 [1] 127 [1]
128 128
129 resolve without arguments should suggest --all 129 resolve without arguments should suggest --all
130 $ hg resolve 130 $ hg resolve
131 abort: no files or directories specified 131 abort: no files or directories specified
132 (use --all to remerge all files) 132 (use --all to re-merge all unresolved files)
133 [255] 133 [255]
134 134
135 resolve --all should re-merge all unresolved files 135 resolve --all should re-merge all unresolved files
136 $ hg resolve -q --all 136 $ hg resolve -q --all
137 warning: conflicts during merge. 137 warning: conflicts during merge.