Mercurial > hg

diff mercurial/simplemerge.py @ 24100:7f23e67e9c38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-help: add test to demonstrate that 'hg help merge-tools' is sane
author Augie Fackler <augie@google.com>
date Tue, 10 Feb 2015 10:57:58 -0500
parents 83df50a8d61c
children 241a1324a180
line wrap: on
line diff