Mercurial > hg
view tests/test-merge8.out @ 9519:0d3c1aa9d5de
extdiff: fix defaulting to "diff" if no --program is given
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Thu, 01 Oct 2009 08:50:10 +0200 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
line wrap: on
line source
updating working directory 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) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved