checkout --conflict=diff3: add a label for ancestor
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 21 Mar 2010 00:40:19 +0000 (19:40 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Mar 2010 03:36:11 +0000 (20:36 -0700)
commitf0531a2...37e919e763ab05e9800aef51658104fc
treedfdddc7...0182ea82365b37a03850d1ceadebca0dcopy hash to clipboard (tree)
parentf01de62...4591a6acc061eb994d44f7eeef7a0cfdcopy hash to clipboard (diff)
builtin/checkout.c
t/t7201-co.sh