mergetools / gvimdiff2on commit Merge branch 'jk/maint-config-multi-order' (e70aee5)
   1. "$MERGE_TOOLS_DIR/vimdiff"