Differences between revisions 1 and 10 (spanning 9 versions)
⇤ ← Revision 1 as of 2005-08-26 00:58:15 →
Size: 159
Editor: waste
Comment:
← Revision 10 as of 2012-11-08 16:27:39 → ⇥
Size: 458
Editor: abuehl
Comment: remove link to deleted page "Diff"
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
== Unified diff == = Unified diff =
Line 3: Line 3:
A unified diff is a PatchFile (or Diff) in [http://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html unified format]. A '''unified diff''' is a [[PatchFile|patch file]] (or diff) in [[http://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html|unified format]]. This is the most popular and prevalent form of diff file used today. Traditionally this was created by running {{{diff}}} with the "-u" option; however, Mercurial's diff command generates unified diffs for you.

See also: [[GitExtendedDiffFormat]]

----
CategoryGlossary

Unified diff

A unified diff is a patch file (or diff) in unified format. This is the most popular and prevalent form of diff file used today. Traditionally this was created by running diff with the "-u" option; however, Mercurial's diff command generates unified diffs for you.

See also: GitExtendedDiffFormat

CategoryGlossary

UnifiedDiff (last edited 2012-11-08 16:27:39 by abuehl)