mirror of
https://github.com/opnsense/src.git
synced 2026-02-24 10:20:24 -05:00
034dd2d54f
diff3 in -m mode generates a complete file with changes bracketed with conflict markers. This adds support for diff3 to generate version control style three way merge output. The output format was inferred from looking at the gnu diff3 output on a selection of test files as a specification of what diff3 -m should output is not available. It is likely there are cases where the -m output differs from other tools and I am happy to update diff3 to address these. Discussed with: pstef, kevans Sponsored by: Klara, Inc. |
||
|---|---|---|
| .. | ||
| 1.out | ||
| 1.txt | ||
| 1cr.txt | ||
| 1t.out | ||
| 2.out | ||
| 2.txt | ||
| 3.out | ||
| 3.txt | ||
| 4.out | ||
| 5.out | ||
| 6.out | ||
| 7.out | ||
| 8.out | ||
| 9.out | ||
| diff3_test.sh | ||
| long-A.out | ||
| long-ed.out | ||
| long-m.txt | ||
| long-merge.out | ||
| long-o.txt | ||
| long-y.txt | ||
| Makefile | ||
| Makefile.depend | ||