Mercurial > hg
diff tests/test-mq-merge @ 7847:30cb79d84352
resolve: keep .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | f18f14bae172 |
children | bb5ea66789e3 7637fe4f525d |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | f18f14bae172 |
children | bb5ea66789e3 7637fe4f525d |