Try to make eflag easier to follow

[thj]

Summary

no functional change intended

[dim]

usr.bin/diff3/diff3.c

115

I'd have called this EFLAG_NONE, for consistency; but it's a matter of taste. :)

538–540

I'd write this as:

if ( (!dup && (eflag == EFLAG_OVERLAP || eflag == EFLAG_UNMERGED) || (dup && (eflag == EFLAG_NOOVERLAP || eflag == EFLAG_UNMERGED)) )

and get rid of the bitmasking stuff. You can then also get rid of the comment altogether (or maybe simplify it.)

[thj]

simplfy the eflag based on suggestions by dim