Mercurial > hg > easyhg-kdiff3
changeset 13:266aeefa1b11
KDiff3 version 0.9.70
| author | joachim99 |
|---|---|
| date | Mon, 06 Oct 2003 19:12:57 +0000 |
| parents | 31907692deee |
| children | 415083d043f3 |
| files | kdiff3/.cvsignore kdiff3/Makefile.cvs kdiff3/TODO kdiff3/configure.files |
| diffstat | 4 files changed, 25 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kdiff3/.cvsignore Mon Oct 06 19:12:57 2003 +0000 @@ -0,0 +1,2 @@ +Makefile +Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kdiff3/Makefile.cvs Mon Oct 06 19:12:57 2003 +0000 @@ -0,0 +1,10 @@ +all: + @echo "This Makefile is only for the CVS repository" + @echo "This will be deleted before making the distribution" + @echo "" + $(MAKE) -f admin/Makefile.common cvs + +dist: + $(MAKE) -f admin/Makefile.common dist + +.SILENT:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/kdiff3/TODO Mon Oct 06 19:12:57 2003 +0000 @@ -0,0 +1,11 @@ +This file contains some feature-wishes for future KDiff3-versions. + +TODO +==== + +- Automatic line wrap in the difference windows +- Printing of the diff-windows (requires automatic line wrap) +- Undo function in the merge-editor. +- Diff should allow to treat C/C++-comments as white space. +- A inserted or removed linefeed should be detected and treated like white space. +