Mercurial > hg
diff tests/test-rename-dir-merge @ 7847:30cb79d84352
resolve: keep .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | 56e9f7b2d8fa |
children | 6c82beaaa11a |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | 56e9f7b2d8fa |
children | 6c82beaaa11a |