Unified diff
From Just Solve the File Format Problem
(Difference between revisions)
(Created page with "{{FormatInfo |subcat=Archiving |extensions={{ext|patch}}, {{ext|diff}} |released=1991 }} '''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidi...") |
m (→Links) |
||
(One intermediate revision by one user not shown) | |||
Line 3: | Line 3: | ||
|extensions={{ext|patch}}, {{ext|diff}} | |extensions={{ext|patch}}, {{ext|diff}} | ||
|released=1991 | |released=1991 | ||
+ | |image=Unified diff.png | ||
+ | |caption=Unified diff example | ||
}} | }} | ||
'''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidiff''') is a [[diff]] format commonly used for patch files. | '''Unified diff''' (or '''diff unified format''', '''unified context diff''', '''unidiff''') is a [[diff]] format commonly used for patch files. | ||
Line 21: | Line 23: | ||
== Links == | == Links == | ||
− | * [[Wikipedia:Diff#Unified_format|Wikipedia: Diff]] has a section on Unified diff | + | * [[Wikipedia:Diff utility#Unified_format|Wikipedia:Diff utility]] has a section on Unified diff |
Latest revision as of 17:06, 26 December 2015
Unified diff (or diff unified format, unified context diff, unidiff) is a diff format commonly used for patch files.
Contents |
[edit] Identification
Unlike other diff formats, Unified diff has lines that begin with "@@".
[edit] Specifications
- Unified Diff Format - Ad-hoc specification by Guido van Rossum
- GNU Diffutilis manual: Detailed Description of Unified Format
[edit] Software
- GNU Diffutils:
diff
(with-u
option),patch
[edit] Sample files
[edit] Links
- Wikipedia:Diff utility has a section on Unified diff