Garance A Drosihn <[EMAIL PROTECTED]>: > I happen to be updating my system tonight, so when it came to the > mergemaster step I first modified the script. I added: > -I '$FreeBSD:.*$' > to the 'diff ${DIFF_FLAG}' command in diff_loop, and it seems to have > worked the way I wanted it to work.
how about making this an option value to the `-c' option? `-c' normally just switches to context-diffs, why not allow users to specify his custom diff(1) options here and in the ~/.mergemasterrc? clemens To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-hackers" in the body of the message