Comparison of files in Linux and comparison of free and open source software

Source: Internet
Author: User
Tags mercurial version control system

Comparison of files in Linux and comparison of free and open source software

The file comparison tool is used to compare the content of files on a computer and find the similarities and differences between them. The comparison result is usually called diff.

Diff is also the name of a famous file comparison program based on the console that can output the differences between two files. Diff was developed on Unix operating systems in the early 1970s S. Diff outputs the differences between two files.

Linux has many good GUI tools, so that you can clearly see the differences between two files or different versions of the same file. This time I selected five of my favorite GUI comparison tools for you. Among them, others are open-source.

These applications allow you to see the differences between files or directories more clearly, merge different files, resolve conflicts, and output them into a new file or patch, it is also used for products that preview and note file changes (for example, you must accept source code changes before the source code is merged into the source file tree ). Therefore, they are very important software development tools. They can help developers process files and transfer files continuously. These comparison tools not only show differences in source code files, but also apply to many types of text files. The visualization feature makes files easier and easier.

Meld

Meld is an open-source, graphical file difference viewing and merging application for Gnome desktops. It supports simultaneous comparison of 2 to 3 files, recursive directory comparison, and Version Control (Bazaar, Codeville, CVS, Darcs, Fossil SCM, Git, Mercurial, Monotone, Subversion). You can also manually or automatically merge file differences.

Meld focuses on helping developers compare and Merge multiple source files and intuitively browse the changed content in their favorite version control system.

Features include

  • Edit files in situ and update files instantly
  • Compare and merge two or three files
  • Navigation Between displayed differences and conflicts
  • Use Insert, change, and conflict tags to visualize local and global differences
  • Built-in Regular Expression text filter to ignore unimportant differences
  • Syntax High Brightness Display (use the optional gtksourceview)
  • Compare files in two to three directories one by one to display newly created, missing, and replaced files.
  • Open the comparison page for any conflicting or different files.
  • Attackers can filter files or directories to avoid certain differences.
  • The automatic merge mode of the changed area makes merging easier.
  • There is also a simple File Management
  • Supports multiple version control systems, including Git, Mercurial, Bazaar, and SVN.
  • Enable file comparison before submission to check the changes and content
  • View the file version status
  • You can also perform simple version control operations (such as submitting, updating, adding, moving, or deleting files)
  • Automatically merge two files inherited from the same file
  • Mark and display all conflicting basic versions in the middle pane
  • Display and merge independent changes of the same file
  • Lock basic files of read-only type to avoid errors
  • Can be integrated into the existing command line interface, including gitmergetool
  • International support
  • Visualization makes files easier

  • URL: meldmerge.org

  • Developer: Kai Willadsen

  • Certificate: gnu gpl v2

  • Version: 1.8.5

DiffMerge

DiffMerge is an application software that can run on Linux, Windows, and OS X and can compare and merge files.

Features:

  • Graphical display of the differences between the two files. Including inserting rows, highlighting, and full support for editing
  • Graphical display of the differences between the three files. (Secure) allows automatic merging and editing of final files.
  • The comparison of two folders is displayed side by side, indicating which file exists only in one folder but not in another folder, you can also pair identical, equivalent, or different files one by one.
  • Rule settings and options allow you to personalize its appearance and Behavior
  • Unicode-based character Import
  • Cross-platform tools

  • URL: sourcegear.com/diffmerge

  • Developer: SourceGear LLC

  • Certificate: Licensed for use free of charge (not open source)

  • Version: 4.2

Xxdiff

Xxdiff is an open-source graphical tool for file, directory comparison and merging.

Xxdiff can be used to display the differences between two or three files or two directories, and generate a merged version. The two or three files to be compared are displayed side by side, and different text content is highlighted in different colors for recognition.

This program is a very important software development tool. It can display the differences between two files or directories in a graphical manner, and merge different files. It is also used for products that preview and note file changes (for example, before the source code is merged into the source file tree, you must first accept the source code changes)

Features:

  • Compare two to three files, or two directories (shallow or recursive)
  • Horizontal highlighted differences
  • Interactive file merging, visual output, and storage
  • Can assist in comments/supervision of mergers
  • When files are automatically merged, CVS conflicts are not merged and displayed as two files to facilitate conflict resolution.
  • Other comparison programs can be used to calculate differences: cleardiff for GNU diff, SGI diff, and ClearCase, and all file comparison programs similar to these program outputs.
  • You can use resource files for complete personalized settings.
  • It is similar to Rudy Wortel or SGI xdiff and has nothing to do with the desktop system.
  • Functions and outputs can be easily integrated with scripts

  • URL: furius. ca/xxdiff

  • Developer: Martin Blais

  • Certificate: GNU GPL

  • Version: 4.0

Diffuse

Diffuse is an open-source graphical tool that can be used to merge and compare text files. Diffuse can compare any number of files and display them side by side. It also supports manual line Matching and adjustment to directly edit files. Diffuse can also get versions from bazaar, CVS, darcs, git, mercurial, monotone, Subversion, and gnu rcs library for comparison and merge.

Features:

  • Compare any number of files and display them side by side (Merge multiple parties)
  • Row matching can be manually corrected by users
  • Directly edit the file
  • Syntax highlighting
  • Supports Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK.
  • Unicode supported
  • Unlimitedly undone
  • Easy-to-use keyboard navigation

  • URL: [diffuse.sourceforge.net] []

  • Developer: Derrick Moser

  • Certificate: gnu gpl v2

  • Version: 0.4.7

Kompare

Kompare is an open-source GUI front-end program that visualizes and merges differences between different source files. Kompare can compare the differences between files and folders. Kompare supports many diff formats and provides various options to set the display information level.

Whether you are a developer who wants to compare the source code or just want to compare the differences between the paper manuscript and the final document, Kompare is a useful tool.

Kompare is part of the KDE Desktop Environment.

Features:

  • Compare two text files
  • Recursive comparison directory
  • Display patches generated by diff
  • Merge patches into an existing Directory
  • It makes compilation easier.

  • URL: www. caffeinated. me. uk/kompare/

  • Developer: The Kompare Team

  • Certificate: GNU GPL

  • Version: Part of KDE

This article permanently updates the link address:

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.