Mercurial > hg

view tests/test-merge3.out @ 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 91c56c427171
children
line wrap: on
line source

removing b
nothing changed