mergetools / gvimdiff3on commit Merge branch 'jk/commit-buffer-length' (8061ae8)
   1. "$MERGE_TOOLS_DIR/vimdiff"