Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.py @ 24803:e89f909edffa stable 3.4-rc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 3.4 freeze
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Apr 2015 20:57:51 -0500
parents 83df50a8d61c
children 241a1324a180
line wrap: on
line diff