Merge pull request #2445 from ethomson/checkout_conflict_test checkout::conflict tests: only test owner mode
2014-06-26T18:24:13