diff hglib/merge.py @ 133:b6f601ba7f3c

style: fixup whitespace
author Matt Mackall <mpm@selenic.com>
date Tue, 30 Sep 2014 11:23:15 -0500
parents ebcc5d7dd528
children fe74d5599539
line wrap: on
line diff