Mercurial > hg

diff mercurial/py3kcompat.py @ 26302:5ba3358ebc7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergecmd: simplify conditional The previous if tested the same thing with 'if repo._activebookmark'. We make the if/else logic clearer before a bigger refactoring.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 17 Sep 2015 12:44:52 -0700
parents a7a9d84f5e4a
children 5bfd01a3c2a9
line wrap: on
line diff