mergetools / vimdiff2on commit Merge branch 'jk/checkout-attribute-lookup' (39c5835)
   1. "$MERGE_TOOLS_DIR/vimdiff"