Mercurial > hg
comparison mercurial/hg.py @ 26302:5ba3358ebc7f
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 | 2b1434e5eaa0 |
children | 7c20d501709b |
comparison
equal
deleted
inserted
replaced
26301:3f8c5c284c86 | 26302:5ba3358ebc7f |
---|