Mercurial > hg
view tests/test-rename-dir-merge2.out @ 4516:96d8a56d4ef9
Removed trailing whitespace and tabs from python files
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 06 Jun 2007 20:22:52 +0200 |
| parents | bb1800a7d7e1 |
| children | 2493a478f395 |
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) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) M b/f A b/aa/g a/aa/g R a/aa/g R a/f