tests: document cherry-pick behavior in face of conflicts
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 21 Mar 2010 00:28:14 +0000 (19:28 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Mar 2010 03:36:10 +0000 (20:36 -0700)
commit6a84334...ab08e7c701ac2343ffbe2d11ecb7ebab
treee255330...bfa1cf626f2e2285417847a02a5d919acopy hash to clipboard (tree)
parent47349a8...c02b3cb39bfc69cb7abec88ad3e34ebfcopy hash to clipboard (diff)
t/t3507-cherry-pick-conflict.sh [new file with mode: 0644]