socsvn - Revision 337283: /mirror/FreeBSD/user/jceel/soc2014_evdev/head/gnu/usr.bin/rcs/rcsmerge