Mercurial > hg

comparison tests/test-simplemerge.py @ 7847:30cb79d84352

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: keep .orig files
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents e75aab656f46
children 08a0f04b56bd
comparison
equal deleted inserted replaced
7834:2444285ec338 7847:30cb79d84352