socsvn - Revision 337283: /soc2012/gmiller/witness-head-2015/gnu/usr.bin/diff3