summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-03-21 00:28:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-21 03:36:10 (GMT)
commit6a843348ab08e7c701ac2343ffbe2d11ecb7ebab (patch)
treee255330fbfa1cf626f2e2285417847a02a5d919a /builtin
parent47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf (diff)
downloadgit-6a843348ab08e7c701ac2343ffbe2d11ecb7ebab.zip
git-6a843348ab08e7c701ac2343ffbe2d11ecb7ebab.tar.gz
git-6a843348ab08e7c701ac2343ffbe2d11ecb7ebab.tar.bz2
tests: document cherry-pick behavior in face of conflicts
We are about to change the format of the conflict hunks that cherry-pick and revert write. Add tests checking the current behavior first. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions