Mercurial > hg
diff tests/test-double-merge @ 7847:30cb79d84352
resolve: keep .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | 99a4592ea886 |
children | 50b6af595e0c |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | 99a4592ea886 |
children | 50b6af595e0c |