tests/test-merge8.out
author Brendan Cully <brendan@kublai.com>
Mon, 10 Sep 2007 15:00:05 -0700
changeset 5294 e14118f92730
parent 4416 bb1800a7d7e1
permissions -rw-r--r--
mq: fix regression in 6fd953d5faea It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate. It should be marked added on the second pass.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved