mergetools / vimdiff2on commit Merge branch 'as/check-ignore' (ef94636)
   1. "$MERGE_TOOLS_DIR/vimdiff"