checkout -m --conflict=diff3: add a label for ancestor
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 21 Mar 2010 00:42:51 +0000 (19:42 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Mar 2010 03:36:11 +0000 (20:36 -0700)
commitc415162...e7019d072cefdac992e164820ce9ed1c
treeb86266d...89ce2ef2b8723fca49358aee8c55b1aecopy hash to clipboard (tree)
parent4c5868f...3d1ec2573f4f511d732bc00d56accc70copy hash to clipboard (diff)
builtin/checkout.c
t/t7201-co.sh