checkout --conflict=<style>: recreate merge in a non-default style
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Sep 2008 02:32:40 +0000 (19:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Sep 2008 03:09:21 +0000 (20:09 -0700)
commiteac5a40...512181cd315a1031af2b8a25430e335a
tree246e7b2...c653c94af9a0cd615281b92e39fda902copy hash to clipboard (tree)
parent0cf8581...330e7140c9f5c94a53d441187c0f8ff9copy hash to clipboard (diff)
Documentation/git-checkout.txt
builtin-checkout.c
t/t7201-co.sh