branch | stable |
changeset 19973 | 1184edaead7a |
parent 19963 | 6f29cc567845 |
child 20064 | 99c4b8f79324 |
--- a/tests/test-shelve.t Sun Oct 27 00:24:25 2013 +0900 +++ b/tests/test-shelve.t Sun Oct 13 08:38:30 2013 -0400 @@ -228,6 +228,7 @@ +a +>>>>>>> other diff --git a/b.rename/b b/b.rename/b + new file mode 100644 --- /dev/null +++ b/b.rename/b @@ -0,0 +1,1 @@ @@ -239,6 +240,7 @@ @@ -1,1 +0,0 @@ -b diff --git a/c.copy b/c.copy + new file mode 100644 --- /dev/null +++ b/c.copy @@ -0,0 +1,1 @@