mergetools / gvimdiff2on commit Merge branch 'jk/complete-merge-pull' into maint (ff7e96b)
   1. "$MERGE_TOOLS_DIR/vimdiff"