Differences between revisions 4 and 6 (spanning 2 versions)
Revision 4 as of 2006-12-30 22:56:22
Size: 374
Comment: Slight elaboration on the topic of unified diffs.
Revision 6 as of 2008-01-13 16:33:03
Size: 426
Editor: abuehl
Comment: lowercase links
Deletions are marked like this. Additions are marked like this.
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]. 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.

----
CategoryGlossary

Unified diff

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.


CategoryGlossary

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