Description Jan Gentsch 2004-05-27 07:40:34 EDT

Using keyword expansion is a major problem for diff and merge operations across
branches in eclipse. As long as keyword expansions is on differences/conflicts
will always be reported though the only thing changed is the revision number.

Thus merge and diff operations should always use "-kk"-Type keyword substitution
except for files with "-ko" or "-kb" substitution modes.