Merge branch 'se/doc-checkout-ours-theirs'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:25 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:25 +0000 (11:01 -0700)
commitc0b901e...f71ca700eb6c8711af0c848df2d011c5
tree77e0220...31844b83b818bfa4e392948dafb7d072copy hash to clipboard (tree)
parent2bf2d81...e1ccd4865500e957cc5953de31255c46copy hash to clipboard (diff)
parentf303016...7b68561392d910f6196380dd3976549ecopy hash to clipboard (diff)
Documentation/git-checkout.txt