summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-03-21 00:27:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-21 03:36:10 (GMT)
commit47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf (patch)
treeab475e75359b3e4c34c71b6db1060136dc04731c /t/t3507-cherry-pick-conflict.sh
parent0d0925c5e25fad8079739be36d88faa21fc1f588 (diff)
downloadgit-47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf.zip
git-47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf.tar.gz
git-47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf.tar.bz2
tests: document format of conflicts from checkout -m
We are about to change the format of the conflict hunks that ‘checkout --merge’ writes. 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 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions