mergetools / vimdiff3on commit apply: handle Subversion diffs with /dev/null gracefully (e454ad4)
   1. "$MERGE_TOOLS_DIR/vimdiff"