mergetools / gvimdiff2on commit Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix (8be1d04)
   1. "$MERGE_TOOLS_DIR/vimdiff"