diff tests/failfilemerge.py @ 29423:d2c6f3a948fa

branchmap: remove unused exception variable
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 12 Mar 2016 16:08:19 -0800
parents 424c1632fffb
children a7f8939641aa
line wrap: on
line diff