Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 33991:aaa65baf460c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update test-obsolete to pass our import checker
author Augie Fackler <raf@durin42.com>
date Tue, 22 Aug 2017 17:15:20 -0400
parents 055fee3547df
children 65ae54582713
line wrap: on
line diff