Mercurial > hg
view tests/test-empty-dir.out @ 7847:30cb79d84352
resolve: keep .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
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