Module Name: othersrc Committed By: agc Date: Tue Jan 15 08:26:16 UTC 2013
Modified Files: othersrc/external/bsd/netdiff/bin/wdiff: Makefile othersrc/external/bsd/netdiff/dist: diffreg.c netwdiff.1 netwdiff.c Log Message: Implement the -n (nowrap) argument to wdiff(1). With the -n argument specified, and when a change spans two lines, the end of region character sequence is displayed before the new line character, and the start of region character sequence after it. Add a test which implements change bars on the left for any changed text: % netwdiff -1n f1 f2 | sed -e 's/^/ /;/{+/s/^ /|/;s/{+//g;s/+}//g' ... static int | difffile(const char *filename1, const char *filename2) { ... To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/netdiff/bin/wdiff/Makefile cvs rdiff -u -r1.8 -r1.9 othersrc/external/bsd/netdiff/dist/diffreg.c cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/netdiff/dist/netwdiff.1 cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/netdiff/dist/netwdiff.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.