Mercurial > hg

diff mercurial/simplemerge.py @ 22259:2e6f03a193f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsmarkers: add a `parentnodes` method to retrieve parent information
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 18 Aug 2014 17:14:27 -0700
parents 83df50a8d61c
children 241a1324a180
line wrap: on
line diff