Mercurial > hg
view tests/test-merge8.out @ 3639:5c9a36210662
templater: simplify parsestring
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 13 Nov 2006 13:26:57 -0600 |
parents | efbe24c7d8d9 |
children | 9103dab96093 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../a searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files (run 'hg update' to get a working copy) merging a and b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved