checkout -m: attempt merge when deletion of path was staged
authorJonathan Nieder <jrnieder@gmail.com>
Wed, 13 Aug 2014 00:03:18 +0000 (17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 22:17:34 +0000 (15:17 -0700)
commit6a143aa...b23b97fa8363e2f4fd16f23b4c5b104d
tree6b8755d...c6c9210f39a5f477c41d859e9114d3c5copy hash to clipboard (tree)
parent6c1db1b...8886f70165cb9f5822b1a2e99a2c331bcopy hash to clipboard (diff)
t/t7201-co.sh
unpack-trees.c