diff tests/test-double-merge.out @ 5294:e14118f92730

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.
author Brendan Cully <brendan@kublai.com>
date Mon, 10 Sep 2007 15:00:05 -0700
parents f191bc3916f7
children 17ed9b9a0d03
line wrap: on
line diff