mergetools / gvimdiff2on commit Merge branch 'jk/fast-export-object-lookup' (4e38e9b)
   1. "$MERGE_TOOLS_DIR/vimdiff"