Diff

Last updated
diff
Original author(s) Douglas McIlroy
(AT&T Bell Laboratories)
Developer(s) Various open-source and commercial developers
Initial releaseJune 1974;50 years ago (1974-06)
Written in C
Operating system Unix, Unix-like, V, Plan 9, Inferno
Platform Cross-platform
Type Command
License Plan 9: MIT License

In computing, the utility diff is a data comparison tool that computes and displays the differences between the contents of files. Unlike edit distance notions used for other purposes, diff is line-oriented rather than character-oriented, but it is like Levenshtein distance in that it tries to determine the smallest set of deletions and insertions to create one file from the other. The utility displays the changes in one of several standard formats, such that both humans or computers can parse the changes, and use them for patching.

Contents

Typically, diff is used to show the changes between two versions of the same file. Modern implementations also support binary files. [1] The output is called a "diff", or a patch, since the output can be applied with the Unix program patch. The output of similar file comparison utilities is also called a "diff"; like the use of the word "grep" for describing the act of searching, the word diff became a generic term for calculating data difference and the results thereof. [2] The POSIX standard specifies the behavior of the "diff" and "patch" utilities and their file formats. [3]

History

diff was developed in the early 1970s on the Unix operating system, which was emerging from Bell Labs in Murray Hill, New Jersey. It was part of the 5th Edition of Unix released in 1974, [4] and was written by Douglas McIlroy, and James Hunt. This research was published in a 1976 paper co-written with James W. Hunt, who developed an initial prototype of diff. [5] The algorithm this paper described became known as the Hunt–Szymanski algorithm.

McIlroy's work was preceded and influenced by Steve Johnson's comparison program on GECOS and Mike Lesk's proof program. Proof also originated on Unix and, like diff, produced line-by-line changes and even used angle-brackets (">" and "<") for presenting line insertions and deletions in the program's output. The heuristics used in these early applications were, however, deemed unreliable. The potential usefulness of a diff tool provoked McIlroy into researching and designing a more robust tool that could be used in a variety of tasks, but perform well in the processing and size limitations of the PDP-11's hardware. His approach to the problem resulted from collaboration with individuals at Bell Labs including Alfred Aho, Elliot Pinson, Jeffrey Ullman, and Harold S. Stone.

In the context of Unix, the use of the ed line editor provided diff with the natural ability to create machine-usable "edit scripts". These edit scripts, when saved to a file, can, along with the original file, be reconstituted by ed into the modified file in its entirety. This greatly reduced the secondary storage necessary to maintain multiple versions of a file. McIlroy considered writing a post-processor for diff where a variety of output formats could be designed and implemented, but he found it more frugal and simpler to have diff be responsible for generating the syntax and reverse-order input accepted by the ed command.

In 1984, Larry Wall created a separate utility, patch, releasing its source code on the mod.sources and net.sources newsgroups. [6] [7] [8] This program modifies files using output from diff and has the ability to match context.

X/Open Portability Guide issue 2 of 1987 includes diff. Context mode was added in POSIX.1-2001 (issue 6). Unified mode was added in POSIX.1-2008 (issue 7). [9]

In diff's early years, common uses included comparing changes in the source of software code and markup for technical documents, verifying program debugging output, comparing filesystem listings and analyzing computer assembly code. The output targeted for ed was motivated to provide compression for a sequence of modifications made to a file.[ citation needed ] The Source Code Control System (SCCS) and its ability to archive revisions emerged in the late 1970s as a consequence of storing edit scripts from diff.

Algorithm

The operation of diff is based on solving the longest common subsequence problem. [5]

In this problem, given two sequences of items:

abcdfg h j q z
abcd e fg i j k r x y z

and we want to find a longest sequence of items that is present in both original sequences in the same order. That is, we want to find a new sequence which can be obtained from the first original sequence by deleting some items, and from the second original sequence by deleting other items. We also want this sequence to be as long as possible. In this case it is

a b c d  f  g  j  z

From a longest common subsequence it is only a small step to get diff-like output: if an item is absent in the subsequence but present in the first original sequence, it must have been deleted (as indicated by the '-' marks, below). If it is absent in the subsequence but present in the second original sequence, it must have been inserted (as indicated by the '+' marks).

e   h i   q   k r x y +   - +   -   + + + +

Usage

The diff command is invoked from the command line, passing it the names of two files: diff originalnew. The output of the command represents the changes required to transform the original file into the new file.

If original and new are directories, then diff will be run on each file that exists in both directories. An option, -r, will recursively descend any matching subdirectories to compare files between directories.

Any of the examples in the article use the following two files, original and new:

In this traditional output format, a stands for added, d for deleted and c for changed. Line numbers of the original file appear before a/d/c and those of the new file appear after. The less-than and greater-than signs (at the beginning of lines that are added, deleted or changed) indicate which file the lines appear in. Addition lines are added to the original file to appear in the new file. Deletion lines are deleted from the original file to be missing in the new file.

By default, lines common to both files are not shown. Lines that have moved are shown as added at their new location and as deleted from their old location. [10] However, some diff tools highlight moved lines.

Output variations

Edit script

An ed script can still be generated by modern versions of diff with the -e option. The resulting edit script for this example is as follows:

24aThis paragraph containsimportant new additionsto this document. . 17ccheck this document. On . 11,15d 0aThis is an importantnotice! It shouldtherefore be located atthe beginning of thisdocument!  .

In order to transform the content of file original into the content of file new using ed, we should append two lines to this diff file, one line containing a w (write) command, and one containing a q (quit) command (e.g. by printf"w\nq\n">>mydiff). Here we gave the diff file the name mydiff and the transformation will then happen when we run ed-soriginal<mydiff.

Context format

The Berkeley distribution of Unix made a point of adding the context format (-c) and the ability to recurse on filesystem directory structures (-r), adding those features in 2.8 BSD, released in July 1981. The context format of diff introduced at Berkeley helped with distributing patches for source code that may have been changed minimally.

In the context format, any changed lines are shown alongside unchanged lines before and after. The inclusion of any number of unchanged lines provides a context to the patch. The context consists of lines that have not changed between the two files and serve as a reference to locate the lines' place in a modified file and find the intended location for a change to be applied regardless of whether the line numbers still correspond. The context format introduces greater readability for humans and reliability when applying the patch, and an output which is accepted as input to the patch program. This intelligent behavior is not possible with the traditional diff output.

The number of unchanged lines shown above and below a change hunk can be defined by the user, even zero, but three lines is typically the default. If the context of unchanged lines in a hunk overlap with an adjacent hunk, then diff will avoid duplicating the unchanged lines and merge the hunks into a single hunk.

A "!" represents a change between lines that correspond in the two files, whereas a "+" represents the addition of a line, and a "-" the removal of a line. A blank space represents an unchanged line. At the beginning of the patch is the file information, including the full path and a time stamp delimited by a tab character. At the beginning of each hunk are the line numbers that apply for the corresponding change in the files. A number range appearing between sets of three asterisks applies to the original file, while sets of three dashes apply to the new file. The hunk ranges specify the starting and ending line numbers in the respective file.

The command diff -c original new produces the following output:

*** /path/to/original timestamp --- /path/to/new timestamp *************** *** 1,3 **** --- 1,9 ----+ This is an important+ notice! It should+ therefore be located at+ the beginning of this+ document!+ This part of the  document has stayed the  same from version to *************** *** 8,20 ****  compress the size of the  changes.  - This paragraph contains- text that is outdated.- It will be deleted in the- near future. It is important to spell ! check this dokument. On the other hand, a  misspelled word isn't  the end of the world. --- 14,21 ---- compress the size of the  changes.   It is important to spell ! check this document. On the other hand, a  misspelled word isn't  the end of the world. *************** *** 22,24 **** --- 23,29 ---- this paragraph needs to  be changed. Things can  be added after it. ++ This paragraph contains+ important new additions+ to this document.

Note: Here, the diff output is shown with colors to make it easier to read. The diff utility does not produce colored output; its output is plain text. However, many tools can show the output with colors by using syntax highlighting.

Unified format

The unified format (or unidiff) [11] [12] inherits the technical improvements made by the context format, but produces a smaller diff with old and new text presented immediately adjacent. Unified format is usually invoked using the "-u" command-line option. This output is often used as input to the patch program. Many projects specifically request that "diffs" be submitted in the unified format, making unified diff format the most common format for exchange between software developers.

Unified context diffs were originally developed by Wayne Davison in August 1990 (in unidiff which appeared in Volume 14 of comp.sources.misc). Richard Stallman added unified diff support to the GNU Project's diff utility one month later, and the feature debuted in GNU diff 1.15, released in January 1991. GNU diff has since generalized the context format to allow arbitrary formatting of diffs.

The format starts with the same two-line header as the context format, except that the original file is preceded by "---" and the new file is preceded by "+++". Following this are one or more change hunks that contain the line differences in the file. The unchanged, contextual lines are preceded by a space character, addition lines are preceded by a plus sign, and deletion lines are preceded by a minus sign.

A hunk begins with range information and is immediately followed with the line additions, line deletions, and any number of the contextual lines. The range information is surrounded by double at signs, and combines onto a single line what appears on two lines in the context format (above). The format of the range information line is as follows:

@@ -l,s +l,s @@ optional section heading

The hunk range information contains two hunk ranges. The range for the hunk of the original file is preceded by a minus symbol, and the range for the new file is preceded by a plus symbol. Each hunk range is of the format l,s where l is the starting line number and s is the number of lines the change hunk applies to for each respective file. In many versions of GNU diff, each range can omit the comma and trailing value s, in which case s defaults to 1. Note that the only really interesting value is the l line number of the first range; all the other values can be computed from the diff.

The hunk range for the original should be the sum of all contextual and deletion (including changed) hunk lines. The hunk range for the new file should be a sum of all contextual and addition (including changed) hunk lines. If hunk size information does not correspond with the number of lines in the hunk, then the diff could be considered invalid and be rejected.

Optionally, the hunk range can be followed by the heading of the section or function that the hunk is part of. This is mainly useful to make the diff easier to read. When creating a diff with GNU diff, the heading is identified by regular expression matching. [13]

If a line is modified, it is represented as a deletion and addition. Since the hunks of the original and new file appear in the same hunk, such changes would appear adjacent to one another. [14] An occurrence of this in the example below is:

-check this dokument. On +check this document. On

The command diff -u original new produces the following output:

--- /path/to/original timestamp+++ /path/to/new timestamp@@ -1,3 +1,9 @@+This is an important+notice! It should+therefore be located at+the beginning of this+document!+This part of the document has stayed the same from version to @@ -8,13 +14,8 @@compress the size of the changes.  -This paragraph contains-text that is outdated.-It will be deleted in the-near future.-It is important to spell -check this dokument. On+check this document. Onthe other hand, a misspelled word isn't the end of the world. @@ -22,3 +23,7 @@this paragraph needs to be changed. Things can be added after it. ++This paragraph contains+important new additions+to this document.

Note: Here, the diff output is shown with colors to make it easier to read. The diff utility does not produce colored output; its output is plain text. However, many tools can show the output with colors by using syntax highlighting.

Note that to successfully separate the file names from the timestamps, the delimiter between them is a tab character. This is invisible on screen and can be lost when diffs are copy/pasted from console/terminal screens.

Extensions

There are some modifications and extensions to the diff formats that are used and understood by certain programs and in certain contexts. For example, some revision control systems—such as Subversion—specify a version number, "working copy", or any other comment instead of or in addition to a timestamp in the diff's header section.

Some tools allow diffs for several different files to be merged into one, using a header for each modified file that may look something like this:

Index: path/to/file.cpp

The special case of files that do not end in a newline is not handled. Neither the unidiff utility nor the POSIX diff standard define a way to handle this type of files. (Indeed, such files are not "text" files by strict POSIX definitions. [15] ) GNU diff and git produce "\ No newline at end of file" (or a translated version) as a diagnostic, but this behavior is not portable. [16] GNU patch does not seem to handle this case, while git-apply does. [17]

The patch program does not necessarily recognize implementation-specific diff output. GNU patch is, however, known to recognize git patches and act a little differently. [18]

Changes since 1975 include improvements to the core algorithm, the addition of useful features to the command, and the design of new output formats. The basic algorithm is described in the papers An O(ND) Difference Algorithm and its Variations by Eugene W. Myers [19] and in A File Comparison Program by Webb Miller and Myers. [20] The algorithm was independently discovered and described in Algorithms for Approximate String Matching, by Esko Ukkonen. [21] The first editions of the diff program were designed for line comparisons of text files expecting the newline character to delimit lines. By the 1980s, support for binary files resulted in a shift in the application's design and implementation.

GNU diff and diff3 are included in the diffutils package with other diff and patch related utilities. [22]

Formatters and front-ends

Postprocessors sdiff and diffmk render side-by-side diff listings and applied change marks to printed documents, respectively. Both were developed elsewhere in Bell Labs in or before 1981.[ citation needed ][ discuss ]

Diff3 compares one file against two other files by reconciling two diffs. It was originally conceived by Paul Jensen to reconcile changes made by two people editing a common source. It is also used by revision control systems, e.g. RCS, for merging. [23]

Emacs has Ediff for showing the changes a patch would provide in a user interface that combines interactive editing and merging capabilities for patch files.

Vim provides vimdiff to compare from two to eight files, with differences highlighted in color. [24] While historically invoking the diff program, modern vim uses git's fork of xdiff library (LibXDiff) code, providing improved speed and functionality. [25]

GNU Wdiff [26] is a front end to diff that shows the words or phrases that changed in a text document of written language even in the presence of word-wrapping or different column widths.

colordiff is a Perl wrapper for 'diff' and produces the same output but with colorization for added and deleted bits. [27] diff-so-fancy and diff-highlight are newer analogues. [28] "delta" is a Rust rewrite that highlights changes and the underlying code at the same time. [29]

Patchutils contains tools that combine, rearrange, compare and fix context diffs and unified diffs. [30]

Algorithmic derivatives

Utilities that compare source files by their syntactic structure have been built mostly as research tools for some programming languages; [31] [32] [33] some are available as commercial tools. [34] [35] In addition, free tools that perform syntax-aware diff include:

spiff is a variant of diff that ignores differences in floating point calculations with roundoff errors and whitespace, both of which are generally irrelevant to source code comparison. Bellcore wrote the original version. [41] [42] An HPUX port is the most current public release. spiff does not support binary files. spiff outputs to the standard output in standard diff format and accepts inputs in the C, Bourne shell, Fortran, Modula-2 and Lisp programming languages. [43] [44] [41] [45] [42]

LibXDiff is an LGPL library that provides an interface to many algorithms from 1998. An improved Myers algorithm with Rabin fingerprint was originally implemented (as of the final release of 2008), [46] but git and libgit2's fork has since expanded the repository with many of its own. One algorithm called "histogram" is generally regarded as much better than the original Myers algorithm, both in speed and quality. [47] [48] This is the modern version of LibXDiff used by Vim. [25]

See also

Other free file comparison tools

Related Research Articles

sed Standard UNIX utility for editing streams of data

sed is a Unix utility that parses and transforms text, using a simple, compact programming language. It was developed from 1973 to 1974 by Lee E. McMahon of Bell Labs, and is available today for most operating systems. sed was based on the scripting features of the interactive editor ed and the earlier qed. It was one of the earliest tools to support regular expressions, and remains in use for text processing, most notably with the substitution command. Popular alternative tools for plaintext string manipulation and "stream editing" include AWK and Perl.

Mbox is a generic term for a family of related file formats used for holding collections of email messages. It was first implemented in Fifth Edition Unix.

In computing, tar is a computer software utility for collecting many files into one archive file, often referred to as a tarball, for distribution or backup purposes. The name is derived from "tape archive", as it was originally developed to write data to sequential I/O devices with no file system of their own, such as devices that use magnetic tape. The archive data sets created by tar contain various file system parameters, such as name, timestamps, ownership, file-access permissions, and directory organization. POSIX abandoned tar in favor of pax, yet tar sees continued widespread use.

compress is a Unix shell compression program based on the LZW compression algorithm. Compared to gzip's fastest setting, compress is slightly slower at compression, slightly faster at decompression, and has a significantly lower compression ratio. 1.8 MiB of memory is used to compress the Hutter Prize data, slightly more than gzip's slowest setting.

comm Standard UNIX utility for comparing files

The comm command in the Unix family of computer operating systems is a utility that is used to compare two files for common and distinct lines. comm is specified in the POSIX standard. It has been widely available on Unix-like operating systems since the mid to late 1980s.

Delta encoding is a way of storing or transmitting data in the form of differences (deltas) between sequential data rather than complete files; more generally this is known as data differencing. Delta encoding is sometimes called delta compression, particularly where archival histories of changes are required.

patch (Unix) Unix utility to apply changes to text files

The computer tool patch is a Unix program that updates text files according to instructions contained in a separate file, called a patch file. The patch file is a text file that consists of a list of differences and is produced by running the related diff program with the original and updated file as arguments. Updating files with patch is often referred to as applying the patch or simply patching the files.

xargs is a command on Unix and most Unix-like operating systems used to build and execute commands from standard input. It converts input from standard input into arguments to a command.

dd is a command-line utility for Unix, Plan 9, Inferno, and Unix-like operating systems and beyond, the primary purpose of which is to convert and copy files. On Unix, device drivers for hardware and special device files appear in the file system just like normal files; dd can also read and/or write from/to these files, provided that function is implemented in their respective driver. As a result, dd can be used for tasks such as backing up the boot sector of a hard drive, and obtaining a fixed amount of random data. The dd program can also perform conversions on the data as it is copied, including byte order swapping and conversion to and from the ASCII and EBCDIC text encodings.

In Unix-like operating systems, find is a command-line utility that locates files based on some user-specified criteria and either prints the pathname of each matched object or, if another action is requested, performs that action on each matched object.

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

<span class="mw-page-title-main">Merge (version control)</span>

In version control, merging is a fundamental operation that reconciles multiple changes made to a version-controlled collection of files. Most often, it is necessary when a file is modified on two independent branches and subsequently merged. The result is a single collection of files that contains both sets of changes.

tail is a program available on Unix, Unix-like systems, FreeDOS and MSX-DOS used to display the tail end of a text file or piped data.

cpio is a general file archiver utility and its associated file format. It is primarily installed on Unix-like computer operating systems. The software utility was originally intended as a tape archiving program as part of the Programmer's Workbench (PWB/UNIX), and has been a component of virtually every Unix operating system released thereafter. Its name is derived from the phrase copy in and out, in close description of the program's use of standard input and standard output in its operation.

This article compares computer software tools that are used for accomplishing comparisons of files of various types. The file types addressed by individual file comparison apps varies but may include text, symbols, images, audio, or video. This category of software tool is often called "file comparison" or "diff tool", but those effectively are equivalent terms — where the term "diff" is more commonly associated with the Unix diff utility.

<span class="mw-page-title-main">File comparison</span>

Editing documents, program code, or any data always risks introducing errors. Displaying the differences between two or more sets of data, file comparison tools can make computing simpler, and more efficient by focusing on new data and ignoring what did not change. Generically known as a diff after the Unix diff utility, there are a range of ways to compare data sources and display the results.

<span class="mw-page-title-main">Unix</span> Family of computer operating systems

Unix is a family of multitasking, multi-user computer operating systems that derive from the original AT&T Unix, whose development started in 1969 at the Bell Labs research center by Ken Thompson, Dennis Ritchie, and others. Initially intended for use inside the Bell System, AT&T licensed Unix to outside parties in the late 1970s, leading to a variety of both academic and commercial Unix variants from vendors including University of California, Berkeley (BSD), Microsoft (Xenix), Sun Microsystems (SunOS/Solaris), HP/HPE (HP-UX), and IBM (AIX).

In computer science and information theory, data differencing or differential compression is producing a technical description of the difference between two sets of data – a source and a target. Formally, a data differencing algorithm takes as input source data and target data, and produces difference data such that given the source data and the difference data, one can reconstruct the target data.

<span class="mw-page-title-main">OCRFeeder</span>

OCRFeeder is an optical character recognition suite for GNOME, which also supports virtually any command-line OCR engine, such as CuneiForm, GOCR, Ocrad and Tesseract. It converts paper documents to digital document files and can serve to make them accessible to visually impaired users.

cat (Unix) Unix command utility

cat is a standard Unix utility that reads files sequentially, writing them to standard output. The name is derived from its function to (con)catenate files . It has been ported to a number of operating systems.

References

  1. ↑ MacKenzie et al. "Binary Files and Forcing Text Comparison" in Comparing and Merging Files with GNU Diff and Patch. Downloaded 28 April 2007. Archived 2017-12-19 at the Wayback Machine
  2. ↑ Eric S. Raymond (ed.), "diff" Archived 2014-01-31 at the Wayback Machine , The Jargon File, version 4.4.7
  3. ↑ IEEE Computer Society; The Open Group (26 September 2008). Standard for Information Technology—Portable Operating System Interface (POSIX) Base Specifications, Issue 7. pp. 2599–2607. IEEE Std. 1003.1-2001 specifies traditional, "ed script", and context diff output formats; IEEE Std. 1003.1-2008 added the (by then more common) unified format.
  4. ↑ https://minnie.tuhs.org/cgi-bin/utree.pl?file=V5/usr/source/s1/diff1.c
  5. 1 2 James W. Hunt; M. Douglas McIlroy (June 1976). "An Algorithm for Differential File Comparison" (PDF). Computing Science Technical Report, Bell Laboratories. 41. Archived (PDF) from the original on 2014-12-26. Retrieved 2015-05-06.
  6. ↑ Larry Wall (November 9, 1984). "A patch applier--YOU WANT THIS!!!". Newsgroup:  net.sources. Usenet:   1457@sdcrdcf.UUCP. Archived from the original on February 19, 2022. Retrieved May 11, 2015.
  7. ↑ Larry Wall (November 29, 1984). "patch version 1.2--YOU WANT THIS". Newsgroup:  net.sources. Usenet:   1508@sdcrdcf.UUCP. Archived from the original on March 21, 2020. Retrieved May 11, 2015.
  8. ↑ Larry Wall (May 8, 1985). "patch version 1.3". Newsgroup:  net.sources. Usenet:   813@genrad.UUCP. Archived from the original on February 19, 2022. Retrieved May 11, 2015.
  9. ↑ diff  – Shell and Utilities Reference, The Single UNIX Specification , Version 4 from The Open Group
  10. ↑ David MacKenzie; Paul Eggert; Richard Stallman (1997). Comparing and Merging Files with GNU Diff and Patch. Bristol: Network Theory. ISBN   978-0-9541617-5-0. Archived from the original on 2015-03-31. Retrieved 2015-03-17.
  11. ↑ "Detailed Description of Unified Format". GNU Diffutils (version 3.7, 7 January 2018). Archived from the original on 18 January 2020. Retrieved 29 January 2020.
  12. ↑ van Rossum, Guido. "Unified Diff Format". All Things Pythonic. Archived from the original on 2019-12-25. Retrieved 2020-01-29.
  13. ↑ 2.2.3 Showing Which Sections Differences Are in, GNU diffutils manual
  14. ↑ Unified Diff Format by Guido van Rossum, June 14, 2006
  15. ↑ http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_403 Archived 2013-04-29 at the Wayback Machine Section 3.206
  16. ↑ "Incomplete Lines (Comparing and Merging Files)". www.gnu.org.
  17. ↑ "git: apply.c". Git. 8 May 2023.
  18. ↑ "patch.c\src - patch.git - GNU patch". git.savannah.gnu.org. In git-style diffs, the "before" state of each patch refers to the initial state before modifying any files,..
  19. ↑ E. Myers (1986). "An O(ND) Difference Algorithm and Its Variations". Algorithmica. 1 (2): 251–266. CiteSeerX   10.1.1.4.6927 . doi:10.1007/BF01840446. S2CID   6996809.
  20. ↑ Webb Miller; Eugene W. Myers (1985). "A File Comparison Program". Software: Practice and Experience. 15 (11): 1025–1040. CiteSeerX   10.1.1.189.70 . doi:10.1002/spe.4380151102. S2CID   15489614.
  21. ↑ Esko Ukkonen (1985). "Algorithms for Approximate String Matching". Information and Control. 64 (1–3): 100–118. doi: 10.1016/S0019-9958(85)80046-2 .
  22. ↑ GNU Diff utilities Archived 2015-03-16 at the Wayback Machine . Made available by the Free Software Foundation. Free Documentation. Free source code.
  23. ↑ "merge (GNU RCS 5.10.0)". gnu.org. Archived from the original on 18 September 2019. Retrieved 22 January 2021.
  24. ↑ Moolenaar, Bram. "Vim documentation: diff". vimdoc.sourceforge.net. Archived from the original on 16 February 2020. Retrieved 1 May 2020. The easiest way to start editing in diff mode is with the "vimdiff" command. This starts Vim as usual, and additionally sets up for viewing the differences between the arguments. vimdiff file1 file2 [file3] [file4] [...file8] This is equivalent to: vim -d file1 file2 [file3] [file4] [...file8]
  25. 1 2 Brabandt, Christian (1 December 2018). "The power of diff". Vimways. Archived from the original on 2 December 2018. Retrieved 1 May 2020.
  26. ↑ "gnu.org". www.gnu.org. Archived from the original on 2020-08-11. Retrieved 2020-09-12.
  27. ↑ "colordiff". www.colordiff.org. Archived from the original on 2018-06-14. Retrieved 2018-06-14.
  28. ↑ "diff-so-fancy". So Fancy. 6 May 2023.
  29. ↑ Davison, Dan (8 May 2023). "dandavison/delta". GitHub .
  30. ↑ Waugh, Tim (12 June 2020). "twaugh/patchutils". GitHub . Archived from the original on 1 October 2020. Retrieved 28 June 2020.
  31. ↑ Horwitz, Susan (June 1990). "Identifying the semantic and textual differences between two versions of a program". ACM SIGPLAN Notices. 25 (6): 234–245. CiteSeerX   10.1.1.49.3377 . doi:10.1145/93548.93574. Archived from the original on 2010-06-12. Retrieved 2017-11-01.
  32. ↑ Yang, Wuu (July 1991). "Identifying syntactic differences between two programs". Software: Practice and Experience. 21 (7): 739–755. CiteSeerX   10.1.1.13.9377 . doi:10.1002/spe.4380210706. S2CID   10853673.
  33. ↑ Grass. Cdiff: A syntax directed Diff for C++ programs. Proceedings USENIX C++ Conf., pp. 181-193, 1992
  34. ↑ Compare++, http://www.coodesoft.com/ Archived 2011-11-29 at the Wayback Machine
  35. ↑ SmartDifferencer, http://www.semanticdesigns.com/Products/SmartDifferencer Archived 2009-10-14 at the Wayback Machine
  36. ↑ "xaizek/zograscope". GitHub. 26 May 2020. Archived from the original on 21 December 2020. Retrieved 27 June 2020.
  37. ↑ DaisyDiff, https://code.google.com/p/daisydiff/ Archived 2015-03-19 at the Wayback Machine
  38. ↑ xmldiffpatch, http://msdn.microsoft.com/en-us/library/aa302294.aspx Archived 2009-10-27 at the Wayback Machine
  39. ↑ xmldiffmerge, http://www.alphaworks.ibm.com/tech/xmldiffmerge Archived 2009-09-24 at the Wayback Machine
  40. ↑ Cheney, Austin. Pretty Diff - Documentation. http://prettydiff.com/documentation.php Archived 2012-07-31 at the Wayback Machine
  41. 1 2 dontcallmedotcom. "spiff". GitHub . Archived from the original on 2015-03-26. Retrieved 2013-06-16.
  42. 1 2 Nachbar, Daniel W (1999-12-01). "HP-UX Porting and Archiving". UK. Archived from the original on 2012-09-05. Retrieved 2013-06-13.
  43. ↑ "SPIFF 1". 1988-02-02. Archived from the original on 2016-10-02. Retrieved 2013-06-16.
  44. ↑ Nachbar, Daniel W (1988-02-02). "Man page". UK. Archived from the original on 2012-09-10. Retrieved 2013-06-16.
  45. ↑ Davide (2009-09-28). "stackoverflow". Archived from the original on 2022-02-19. Retrieved 2013-06-16.
  46. ↑ Libenzi, Davide. "LibXDiff". SourceForge FreshMeat. Archived from the original on 2020-07-01. Retrieved 2020-06-28.
  47. ↑ Nugroho, Yusuf Sulistyo; Hata, Hideaki; Matsumoto, Kenichi (January 2020). "How different are different diff algorithms in Git?: Use --histogram for code changes". Empirical Software Engineering: 790–823. arXiv: 1902.02467 . doi: 10.1007/s10664-019-09772-z . S2CID   59608676.
  48. ↑ "algorithm - What's the difference between 'git diff --patience' and 'git diff --histogram'?". Stack Overflow. Archived from the original on 2022-02-19. Retrieved 2020-06-28. This does indeed show that histogram diff slightly beats Myers, while patience is much slower than the others.

Further reading

This page is based on this Wikipedia article
Text is available under the CC BY-SA 4.0 license; additional terms may apply.
Images, videos and audio are available under their respective licenses.