checkout: move 'confict_style' and 'dwim_..' to checkout_opts
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Fri, 29 Mar 2019 10:39:03 +0000 (17:39 +0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Apr 2019 04:56:59 +0000 (13:56 +0900)
commit55cf704...9d139bca0cb5cca1bf047eb043e13bd2
tree8fafc98...8dfb2f2009e14cdf1717daf49b3e9d10copy hash to clipboard (tree)
parentb3edccb...67ab4531e6a5fd20610a3be93be01c70copy hash to clipboard (diff)
builtin/checkout.c