Mercurial > hg
comparison tests/test-double-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 | 50b6af595e0c |
comparison
equal
deleted
inserted
replaced
7834:2444285ec338 | 7847:30cb79d84352 |
---|