mergetools / gvimdiff2on commit Merge branch 'ew/rebase-mboxrd' (12e87e2)
   1. "$MERGE_TOOLS_DIR/vimdiff"