Differences between revisions 6 and 7
Revision 6 as of 2008-01-13 16:33:03
Size: 426
Editor: abuehl
Comment: lowercase links
Revision 7 as of 2009-05-19 19:31:00
Size: 430
Editor: localhost
Comment: converted to 1.6 markup
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|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.


CategoryGlossary

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