Attachment 29984 Details for Bug 50697 – file.diff

[patch] file.diff

file.diff (text/plain), 1.22 KB, created by Heiner on 2003-04-07 23:00:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Heiner

Created: 2003-04-07 23:00:25 UTC

Size: 1.22 KB

patch

obsolete

>diff -urN kdiff3.orig/distinfo kdiff3/distinfo
>--- kdiff3.orig/distinfo        Fri Jan 10 07:22:51 2003
>+++ kdiff3/distinfo     Mon Apr  7 23:32:35 2003
>@@ -1 +1 @@
>-MD5 (kdiff3-0.92.tar.gz) = 2dfa39aecd7c801496eea5e4b315121b
>+MD5 (kdiff3-0.9.50.tar.gz) = 2aa73b3c76213bdc69184d7806897a0e
>diff -urN kdiff3.orig/files/patch-pdiff.cpp kdiff3/files/patch-pdiff.cpp
>--- kdiff3.orig/files/patch-pdiff.cpp   Thu Jan  1 01:00:00 1970
>+++ kdiff3/files/patch-pdiff.cpp        Mon Apr  7 21:13:48 2003
>@@ -0,0 +1,10 @@
>+--- kdiff3/pdiff.cpp.orig      Mon Apr  7 21:12:32 2003
>++++ kdiff3/pdiff.cpp   Mon Apr  7 21:13:01 2003
>+@@ -53,6 +53,7 @@
>+ #else
>+ #include <unistd.h>
>+ #endif
>++#include <errno.h>
>+
>+ using namespace std;
>+
>diff -urN kdiff3.orig/pkg-descr kdiff3/pkg-descr
>--- kdiff3.orig/pkg-descr       Fri Jan 10 07:22:51 2003
>+++ kdiff3/pkg-descr    Mon Apr  7 23:15:20 2003
>@@ -4,7 +4,8 @@
>     * shows the differences line by line and character by character (!),
>     * provides an automatic merge-facility and
>     * an integrated editor for comfortable solving of merge-conflicts
>-    * and has an intuitive graphical user interface.
>+    * and has an intuitive graphical user interface,
>+    * and it can also compare and merge directories!

Actions: View | Diff

Attachments on bug 50697: 29983 | 29984 | 29985