Differences between revisions 9 and 10
Revision 9 as of 2012-05-13 14:27:17
Size: 467
Editor: 62
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 3: Line 3:
A '''unified [[Diff|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. 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.

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)