diff .hgignore @ 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 3232f92360d4
children a1eff44c432b
line wrap: on
line diff