mergetools / gvimdiff3on commit Merge branch 'jk/ident-loosen-getpwuid' into maint (e54d0f5)
   1. "$MERGE_TOOLS_DIR/vimdiff"