diff3
E299207
diff3 is a GNU Diffutils command-line program that compares and merges three versions of a file, commonly used for resolving merge conflicts.
All labels observed (1)
| Label | Occurrences |
|---|---|
| diff3 canonical | 1 |
Statements (47)
| Predicate | Object |
|---|---|
| instanceOf |
GNU Diffutils program
ⓘ
command-line program ⓘ file comparison tool ⓘ merge tool ⓘ |
| commandLineOption |
--help
ⓘ
--version ⓘ -3 ⓘ -A ⓘ -E ⓘ -X ⓘ -a ⓘ -e ⓘ -m ⓘ -x ⓘ |
| developer | Free Software Foundation ⓘ |
| distribution |
GNU Hurd
ⓘ
surface form:
GNU operating system
most GNU/Linux distributions ⓘ |
| documentation |
GNU Diffutils
ⓘ
surface form:
GNU Diffutils manual
|
| genre |
merge conflict resolver
ⓘ
text comparison ⓘ |
| input | three file paths ⓘ |
| interface | command-line interface ⓘ |
| license | GNU General Public License ⓘ |
| maintainer |
GNU Project
ⓘ
surface form:
GNU project
|
| operatingSystem |
GNU/Linux
ⓘ
Unix-like systems ⓘ macOS ⓘ |
| output |
conflict-marked text
ⓘ
ed script ⓘ merged file ⓘ |
| partOf | GNU Diffutils ⓘ |
| programmingLanguage | C ⓘ |
| supports |
RCS-style merge
ⓘ
custom conflict markers ⓘ ed script output ⓘ line-based comparison ⓘ merge conflict marking ⓘ overlapping change detection ⓘ three-way file comparison ⓘ three-way file merge ⓘ |
| usedBy |
Bazaar
ⓘ
Git ⓘ Mercurial ⓘ version control systems ⓘ |
| usedFor |
integrating changes from multiple branches
ⓘ
merging three versions of a file ⓘ resolving merge conflicts ⓘ |
Referenced by (1)
Full triples — surface form annotated when it differs from this entity's canonical label.