tests/test-merge4.out
author Emanuele Aina <em@nerd.ocracy.org>
Wed, 06 Jun 2007 22:17:35 +0200
changeset 4691 ca4971347e0a
parent 2175 b2ae81a7df29
permissions -rw-r--r--
purge: don't delete ignored files if --all is not specified

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)