mergetools / gvimdiff3on commit Merge branch 'jk/complete-merge-pull' (5cf2c57)
   1. "$MERGE_TOOLS_DIR/vimdiff"