diff mercurial/progress.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 72bccc1f26b1
children 1aee2ab0f902
line wrap: on
line diff