Mercurial > hg

diff tests/test-rename-merge1 @ 3400:d2b55e3c4e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: if filemerge skips merge, report as updated
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Oct 2006 16:18:09 -0500
parents 764688cf51e5
children c0b449154a90
line wrap: on
line diff