Module Name:	pkgsrc
Committed By:	recht
Date:		Mon Feb 16 16:34:02 UTC 2004

Modified Files:
	pkgsrc/devel/tkdiff: Makefile distinfo

Log Message:
update to 3.09
take maintainership
ok'd by sakamoto@

3.09 changes (5/24/2001):
* Removed use of the user name in temp file path. This removed a problem
  on Windows when the user name had a space in it.
* Made diff "edge detection" smarter by using the new smarter overlap code
  for cases where diff decided to treat whitespace slightly different
  on missing-EOL files when doing 3-way diffs.
* Added the "..." back to the Save options in the merge result window
  when appropriate.

3.08 changes (1/15/2001):
* Made overlap detection smarter

3.07 changes (12/17/2000):
* Highlight overlaps in bright yellow during 3-way merge
* Added "Exit" and "Save & Exit" buttons to merge preview window
* Removed error that popped up when doing a merge that was
  not necessary.

3.06 changes (unreleased):
* Minor changes for AccuRev integration


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 pkgsrc/devel/tkdiff/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/devel/tkdiff/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.