Mercurial > hg
view tests/test-empty-dir.out @ 6362:bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Mar 2008 20:37:02 +0100 |
parents | b2ae81a7df29 |
children |
line wrap: on
line source
321 0 files updated, 0 files merged, 1 files removed, 0 files unresolved sub/b not present sub not present