Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-mq.out @ 2942:f4fc0575e8fa
merge with brendan.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 18 Aug 2006 13:01:40 -0700 |
parents | 2f190e998eb3 |
children | a4374f7331e4 |
line wrap: on
line diff
--- a/tests/test-mq.out +++ b/tests/test-mq.out @@ -127,3 +127,22 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) +new file + +diff --git a/new b/new +new file mode 100755 +--- /dev/null ++++ b/new +@@ -0,0 +1,1 @@ ++foo +copy file + +diff --git a/new b/copy +copy from new +copy to copy +Now at: new +applying copy +Now at: copy +diff --git a/new b/copy +copy from new +copy to copy