mergetools / vimdiff2on commit Merge branch 'jk/test-hashmap-updates' (34b65c6)
   1. "$MERGE_TOOLS_DIR/vimdiff"