View | Details | Raw Unified | Return to bug 50697 | Differences between
and this patch

Collapse All | Expand All

(-)kdiff3/distinfo Mon Apr 7 23:32:35 2003 (-1 / +1 lines)
Line 1 Link Here
1 
MD5 (kdiff3-0.92.tar.gz) = 2dfa39aecd7c801496eea5e4b315121b
 1 
MD5 (kdiff3-0.9.50.tar.gz) = 2aa73b3c76213bdc69184d7806897a0e
(-)kdiff3/files/patch-pdiff.cpp Mon Apr 7 21:13:48 2003 (+10 lines)
Line 0 Link Here
1 
--- kdiff3/pdiff.cpp.orig      Mon Apr  7 21:12:32 2003
2 
+++ kdiff3/pdiff.cpp   Mon Apr  7 21:13:01 2003
3 
@@ -53,6 +53,7 @@
4 
 #else
5 
 #include <unistd.h>
6 
 #endif
7 
+#include <errno.h>
8 

            

            

              9
              
 using namespace std;

            

            

              10
              

            



(-)kdiff3/pkg-descr    Mon Apr  7 23:15:20 2003
      (-1 / +2 lines)




  

    
      
            Lines 4-10
          
      
      
        Link Here
      
    
  

        

          4
          
    * shows the differences line by line and character by character (!),

          4
          
    * shows the differences line by line and character by character (!),

        

        

          5
          
    * provides an automatic merge-facility and

          5
          
    * provides an automatic merge-facility and

        

        

          6
          
    * an integrated editor for comfortable solving of merge-conflicts

          6
          
    * an integrated editor for comfortable solving of merge-conflicts

        

          
            

              7
              
    * and has an intuitive graphical user interface.


              7
              
    * and has an intuitive graphical user interface,

            

            

              
              

              8
              
    * and it can also compare and merge directories!

            






  

  Return to bug 50697