Mercurial > python-hglib
diff hglib/merge.py @ 86:f98d6e234cd9
util: eliminate py2.6 if/else expression
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 17 Nov 2011 12:53:41 -0600 |
parents | ebcc5d7dd528 |
children | fe74d5599539 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 17 Nov 2011 12:53:41 -0600 |
parents | ebcc5d7dd528 |
children | fe74d5599539 |