Mercurial > hg-stable

diff tests/test-conflict.t @ 25844:18541e9510c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make merge.preferancestor type and default consistent (and mark it)
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jun 2015 17:54:55 -0500
parents 3d0572ab3b4a
children a4da463df6cf
line wrap: on
line diff