Mercurial > hg
diff tests/test-copy-move-merge.out @ 7847:30cb79d84352
resolve: keep .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | 368a4ec603cc |
children | af5f099d932b |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | 368a4ec603cc |
children | af5f099d932b |