Main > Free Download Search >

Free submerge software for linux

submerge

Sponsored Links
Sponsored Links
Sort by >> Relevance
rss
Secleted [ 0 ] software to compare
Results 1 - 15 of about 2
Submerge 0.14.1

Submerge 0.14.1


Submerge is subcommanders visual diff and merge tool for text files. more>>
Submerge project is subcommanders visual diff and merge tool for text files.
Main features:
- line based difference of text files.
- an easy to understand display of differences with just one color (three colors in merge case).
- mousewheel support to quickly scroll to the next or previous difference.
- two way or three way merge.
- shows whitespaces and linefeeds in a lighter color to keep the focus on the text.
- option to ignore whitespace differences.
- supports a wide range of different file encodings (like utf8, latin1 or cp932 and shift_jis (japanese encodings)).
- supports copy & paste, copy from the source files, copy from & paste to the merged file.
- a merge editor to edit the merged file.
- based on subversions diff library.
<<less
Download (6.6MB)
Added: 2005-12-14 License: GPL (GNU General Public License) Price:
1643 downloads
Subcommander 0.14.1

Subcommander 0.14.1


Subcommander is a qt based multiplatform subversion client, diff & merge tool. more>>
Subcommander is a qt based multiplatform subversion client, diff & merge tool.
The goal of the Subcommander project is to build an easy to use, cross platform (Win32, Unix, MacOSX) subversion gui client (subcommander) including a visual diff and merge tool with support for different text encodings (submerge).
Main features:
- tight integration of repository browser and working copy status view, you can quickly switch between a working copy view or the repository view. It just a matter of selecting another item in a list view control.
- colored working copy status view to quickly see which files/folder have changed.
- easy branch and tag handling. By telling subcommander the projects urls for trunk, branches and tags and a working copy path it takes only a few mouse clicks to create a branch/tag or switch your working copy to a branch/tag.
- has drag and drop support to move or copy files and folders.
- easy handling of multiple working copies (e.g. different branches) from the same project.
- easy merging of single revisions or revision ranges. Viewing the history on a repository url you can easily merge changes to your working copy. Just select a revision and tell subcommander to merge it into your (configured) working copy. That is especially usefull to merge bug fixes from trunk to your current release branch.
- visual diff and merge for text files (configurable, defaults to submerge).
- cross platform (Win32, MacOSX, Unix)
- responsive gui, actions on the repository (like getting history information) will not freeze the gui.
- what is implemented?
- support for http(s)://..., svn(+ssh)://... file://... schemes.
- browse a repository, (svn ls)
- view the status of a working copy, (svn status)
- checkout a working copy from a repository, (svn checkout)
- add files to a working copy (svn add)
- revert files in a working copy (svn revert)
- create folders in a working copy or the repository (svn mkdir)
- commit changes to a repository (svn commit)
- diff a file in a working copy against its base version (spawns submerge) (svn diff)
- view diffs between two repository versions or between the working copy and a repository version (from the log dialog, spawns submerge) (svn diff)
- update a working copy (svn update)
- switch a working copy (svn switch)
- merge (svn merge)
- edit conflicts (runs submerge)
- tell subversion that you resolved a conflict (svn resolved)
- view log messages on repository (svn log)
- deleting files in a working copy (svn delete)
- creating branches/tags of repository folders (svn copy)
- view files from the repository or working copy (from the log dialog) (svn cat)
- add, modify and delete properties in a working copy (svn prop...)
- move items in a working copy (svn move)
- view blame info of a working copy file (svn blame)
- import files (svn import)
- export (svn export)
- cleanup (svn cleanup)
- locking (svn lock, svn unlock)
<<less
Download (6.6MB)
Added: 2005-12-14 License: GPL (GNU General Public License) Price:
1411 downloads
Secleted [ 0 ] software to compare
  • Page: 1 of 1
  • 1