merge-recursive: preserve skip_worktree bit when necessary
authorElijah Newren <newren@gmail.com>
Fri, 27 Jul 2018 12:59:44 +0000 (12:59 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Jul 2018 18:15:20 +0000 (11:15 -0700)
commit2b75fb6...1c05a789988cf0e1b3c1375ee62d3c3e
tree5aec8ba...804e1259b7d0acb80f9c505d107e0235copy hash to clipboard (tree)
parent92203e6...32cd77c3dfc82bd475a4c802085cffcbcopy hash to clipboard (diff)
merge-recursive.c
t/t3507-cherry-pick-conflict.sh