comparison mercurial/scmutil.py @ 26608:ae5b60d3294f

filemerge: deindent the parts of filemerge outside the try block It is no longer necessary to indent these parts.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 08 Oct 2015 00:19:20 -0700
parents 56b2bcea2529
children 88c4e97b9669
comparison
equal deleted inserted replaced
26607:45a6233d5f50 26608:ae5b60d3294f