someday there will be something useful to say here testing, testing. 1 lines added in master... ...in branch... //<<<<<<< HEAD //...while feature branch outside //...to create conflicts... //======= //...in feature branch //...which will conflict with other branch //>>>>>>> derekfeature leaving conflict in place but nudged aside for reference and finally tacking this on the end testing again $NHDT-Date: 1427209566 2015/03/24 15:06:06 $ $NHDT-Branch: master $:$NHDT-Revision: 1.13 $ goo