mergetools / gvimdiff2on commit Merge branch 'en/merge-fixes' (10b8084)
   1. "$MERGE_TOOLS_DIR/vimdiff"