Mercurial > hg
view tests/test-rename-dir-merge2.out @ 4339:26a2fa9433b8
hgweb: make PATH_INFO handling slightly more robust
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 12 Apr 2007 11:00:21 -0500 |
| parents | 4787e2b0dd03 |
| children | bb1800a7d7e1 |
line wrap: on
line source
adding a/f 1 files updated, 0 files merged, 0 files removed, 0 files unresolved copying a/f to b/f removing a/f adding a/aa/g pulling from ../r2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) merging a/f and b/f 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M b/f a/f A b/aa/g a/aa/g R a/aa/g R a/f