filemerge: deindent the parts of filemerge outside the try block
It is no longer necessary to indent these parts.
#require test-repo
Enable obsolescence to avoid the warning issue when obsmarker are found
$ cat >> $HGRCPATH << EOF
> [experimental]
> evolution=createmarkers
> EOF
Go back in the hg repo
$ cd $TESTDIR/..
$ for node in `hg log --rev 'draft() and ::.' --template '{node|short}\n'`; do
> hg export $node | contrib/check-commit > ${TESTTMP}/check-commit.out
> if [ $? -ne 0 ]; then
> echo "Revision $node does not comply to rules"
> echo '------------------------------------------------------'
> cat ${TESTTMP}/check-commit.out
> echo
> fi
> done