tests/test-merge4.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 08 May 2007 12:16:02 -0700
changeset 4418 0532491f7476
parent 2175 b2ae81a7df29
permissions -rw-r--r--
MQ: tidy up if a qpush is interrupted. This aborts the transaction, makes sure the dirtied dirstate isn't written out, and cleans up the working directory.

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)