diff3

diff3

diff3 is a Unix utility to compare three files and show any differences among them. diff3 can also merge files, implementing the so called three-way merge.

Merging from a common ancestor

When two people have made changes to copies of the same file, diff3 can produce a merged output that contains both sets of changes together with warnings about conflicts. diff3 can merge three or more sets of changes to a file by merging two change sets at a time.

diff3 can incorporate changes from two modified versions into a common preceding version. This enables users to merge the sets of changes represented by the two newer files. This can be enabled using a command like this: diff3 mine older yours.

This is like subtracting the file older from the file yours and adding the result to the file mine, or as merging into mine the changes that would turn older into yours. This merging is well-defined as long as mine and older match in the neighborhood of each such change. This fails to be true when all three input files differ or when only older differs; this is a conflict. When all three input files differ, the conflict is an overlap.

diff3 has several methods to handle overlaps and conflicts. It can omit overlaps or conflicts, or select only overlaps, or mark conflicts with special '<<<<<<<' and '>>>>>>>' lines.

diff3 can output the merge results as an ed script that can be applied to the first file to yield the merged output. However, directly generating the merged output bypasses some problems with ed.

See also

External links


Wikimedia Foundation. 2010.

Игры ⚽ Поможем сделать НИР

Look at other dictionaries:

  • Diff3 — is a Unix utility to compare three files and show any differences among them. diff3 also can merge files.Merging from a common ancestorWhen two people have made changes to copies of the same file, diff3 can produce a merged output that contains… …   Wikipedia

  • Comparison of file comparison tools — Contents 1 General 2 Compare Features 3 API / Editor Features 4 Other features 5 Aspects …   Wikipedia

  • Diff — In computing, diff is a file comparison utility that outputs the differences between two files, or the changes made to a current file by comparing it to a former version of the same file. Diff displays the changes made per line for text files.… …   Wikipedia

  • diff — This article is about the file comparison utility. For other uses, see DIFF (disambiguation). Diffs redirects here. For the American punk rock group, see The Diffs. In computing, diff is a file comparison utility that outputs the differences… …   Wikipedia

  • Emerge — may refer to:* Portage (software) emerge, a command line tool at the heart of Portage package management system * Fischerspooner Emerge, a song by Fischerspooner * Emacs Emerge, a frontend for the diff and diff3 commands for Emacs * , the fourth… …   Wikipedia

  • Merge (revision control) — Merging (also called integration) in revision control, is a fundamental operation that reconciles multiple changes made to a revision controlled collection of files. Most often, it is necessary when a file is modified by two people on two… …   Wikipedia

  • UnxUtils — is a collection of ports of common GNU Unix like utilities to native Win32, with executables only depending on the Microsoft C runtime msvcrt.dll. The collection was last updated on April 15, 2003 by Dr. Karl M. Syring. The distribution includes… …   Wikipedia

  • Diff — ist ein Unix Programm, das synoptisch die Unterschiede zwischen zwei Textdateien zeilen bzw. abschnittweise einander gegenüberstellt. Inhaltsverzeichnis 1 Grundlagen 2 Programmfunktion 2.1 Aufruf 2.2 Ausgabe 3 Gesch …   Deutsch Wikipedia

  • Liste Des Paquets GNU — GNU N est pas Unix Ceci est une liste des paquets logiciel développés par ou maintenus par la Free Software Foundation pour GNU, un système d exploitation libre, compatible UNIX, dont le développement a débuté en 1984. Un grand nombre de ces… …   Wikipédia en Français

  • Liste des paquets GNU — Article principal : GNU. GNU N est pas Unix Cet article liste les paquets logiciels du système GNU maintenus par le projet GNU et soutenus par la Free Software Foundation. Sommaire …   Wikipédia en Français

Share the article and excerpts

Direct link
Do a right-click on the link above
and select “Copy Link”