Mercurial > hg-stable

comparison tests/test-merge1.t @ 12664:545ec1775021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents 4134686b83e1
children d724a69309e0
comparison
equal deleted inserted replaced
12663:8269af351a64 12664:545ec1775021
164 @@ -1,1 +1,1 @@ 164 @@ -1,1 +1,1 @@
165 -This is file b1 165 -This is file b1
166 +This is file b33 166 +This is file b33
167 $ hg status 167 $ hg status
168 M b 168 M b
169
170 Test for issue2364
171
172 $ hg up -qC .
173 $ hg rm b
174 $ hg ci -md
175 $ hg revert -r -2 b
176 $ hg up -q -- -2