diff hgext/schemes.py @ 21261:6ca05c46aa95

mergestate: consistently set variables to None Some code branches and exceptional circumstances such as empty mergestate files could result in mergestate._local and mergestate._other not being defined or reset to None. These variables are now correctly set to None when they should be.
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 08 May 2014 16:48:28 -0700
parents b52404a914a9
children 80c5b2666a96
line wrap: on
line diff