mirror of
https://github.com/opnsense/src.git
synced 2026-06-06 23:32:52 -04:00
b37a6938e3
In gnu diff3 3 way merging files where the new file and the target are already the same will die and show what has failed to be merged except if -E is passed in argument, in this case it will finish the merge. This difference in behaviour was breaking one of the etcupdate testcase with bsd diff3 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D41730
5 lines
90 B
Text
5 lines
90 B
Text
# $FreeBSD: head/local 12345 jhb $
|
|
|
|
this is a file
|
|
|
|
these are some local mods to the file
|