Mercurial > hg

diff tests/test-mq-merge.out @ 4333:4f721e96f1de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add test for issue 529 - "mq aborts when merging patch deleting files".
author Patrick Mezard <pmezard@gmail.com>
date Sat, 07 Apr 2007 19:42:26 +0100
parents
children a210b40d0860
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-mq-merge.out	Sat Apr 07 19:42:26 2007 +0100
@@ -0,0 +1,11 @@
+adding a
+adding b
+copy .hg/patches to .hg/patches.1
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+M b
+a
+b
+merging with queue at: .hg/patches.1
+applying rm_a
+Now at: rm_a
+b