K 10 svn:author V 6 jkoshy K 8 svn:date V 27 2006-01-07T04:44:46.000000Z K 7 svn:log V 88 Upgrade to v1.16. This version adds an '-ignore-identical-conflicts' option to fmerge. END