added testing -checkout-theirs.doc
added testing -checkout-theirs.doc
updated testing-checkout-theirs.doc by checkouttest
updated testing-checkout-theirs.doc by master
Merge branch 'checkouttest'

Conflicts:
	testing-checkout-theirs.doc