changeset 20294 | 243ea5ffdf31 |
parent 16124 | 0e0060bf2f44 |
child 22520 | 9d4ebb75de53 |
--- a/tests/test-mq-merge.t Tue Jan 14 13:38:16 2014 -0800 +++ b/tests/test-mq-merge.t Sat Nov 16 15:46:29 2013 -0500 @@ -147,11 +147,13 @@ -b +a +c - diff --git a/aa b/aa - new file mode 100644 - --- /dev/null + diff --git a/a b/aa + copy from a + copy to aa + --- a/a +++ b/aa - @@ -0,0 +1,1 @@ + @@ -1,1 +1,1 @@ + -b +a Check patcha2 is still a regular patch: