cvs commit: ports/devel Makefile ports/devel/diffuse Makefile distinfo pkg-descr pkg-plist

[Martin Wilke]

miwi        2009-04-11 22:27:51 UTC

  FreeBSD ports repository

  Modified files:
    devel                Makefile 
  Added files:
    devel/diffuse        Makefile distinfo pkg-descr pkg-plist 
  Log:
  Diffuse is a graphical tool for merging and comparing text files. Diffuse is
  able to compare an arbitrary number of files side-by-side and gives users the
  ability to manually adjust line matching and directly edit files. Diffuse can
  also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,
  Monotone, Subversion, and SVK repositories for comparison and merging.
  
  Some key features of Diffuse:
  
  - ability to compare and merge an arbitrary number of files side-by-side
    (n-way merges)
  - line matching can be manually corrected by the user
  - ability to directly edit files
  - syntax highlighting
  - Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK support
  - support for UTF-8 encoded unicode
  - unlimited undo
  - easy keyboard navigation
  
  WWW:    http://diffuse.sourceforge.net/
  
  PR:             ports/132027
  Submitted by:   Marco Broeder <marco.broeder at gmx.eu>
  
  Revision  Changes    Path
  1.3465    +1 -0      ports/devel/Makefile
  1.1       +106 -0    ports/devel/diffuse/Makefile (new)
  1.1       +3 -0      ports/devel/diffuse/distinfo (new)
  1.1       +19 -0     ports/devel/diffuse/pkg-descr (new)
  1.1       +48 -0     ports/devel/diffuse/pkg-plist (new)