Mercurial > hg

diff mercurial/merge.py @ 17387:1fce478552b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix template test output
author Matt Mackall <mpm@selenic.com>
date Fri, 24 Aug 2012 14:52:45 -0500
parents 98687cdddcb1
children ce7bc04d863b
line wrap: on
line diff