tests/test-merge4.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 23 Oct 2006 23:32:56 -0300
changeset 3486 fbf8320f25c8
parent 2175 b2ae81a7df29
permissions -rw-r--r--
make mq play nicely with the branch cache - if no patches are applied, don't do anything different - if the cache includes valid data from one of the patch revisions, use the cache, but don't save anything new - if the cache has data from before the patch revisions only, save what the list of branches would be without the patch revisions

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)