mergetools / vimdiff2on commit commit: make ignore_non_trailer take buf/len (710714a)
   1. "$MERGE_TOOLS_DIR/vimdiff"