|
Size: 374
Comment: Slight elaboration on the topic of unified diffs.
|
Size: 467
Comment:
|
| 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]. 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. 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