mergetools / gvimdiff3on commit Merge branch 'nd/lockfile-absolute' (bb86a40)
   1. "$MERGE_TOOLS_DIR/vimdiff"