comparison tests/test-mq.out @ 2952:6ba3409f9725

merge.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 18 Aug 2006 17:02:38 -0700
parents 2f190e998eb3
children a4374f7331e4
comparison
equal deleted inserted replaced
2951:5ddf7d305a27 2952:6ba3409f9725
125 adding changesets 125 adding changesets
126 adding manifests 126 adding manifests
127 adding file changes 127 adding file changes
128 added 1 changesets with 1 changes to 1 files 128 added 1 changesets with 1 changes to 1 files
129 (run 'hg update' to get a working copy) 129 (run 'hg update' to get a working copy)
130 new file
131
132 diff --git a/new b/new
133 new file mode 100755
134 --- /dev/null
135 +++ b/new
136 @@ -0,0 +1,1 @@
137 +foo
138 copy file
139
140 diff --git a/new b/copy
141 copy from new
142 copy to copy
143 Now at: new
144 applying copy
145 Now at: copy
146 diff --git a/new b/copy
147 copy from new
148 copy to copy