mergetools / gvimdiff2on commit Merge branch 'np/lookup-object-hashing' (3fb9d68)
   1. "$MERGE_TOOLS_DIR/vimdiff"