Mercurial > hg
view tests/test-simplemerge-cmd.out @ 7847:30cb79d84352
resolve: keep .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | ea7b982b6c08 |
children | e1f4343db740 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | ea7b982b6c08 |
children | e1f4343db740 |