summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-01 06:01:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-01 06:01:14 (GMT)
commit87a23e77c6ffc5713eff3a4a4da036731da2dc3f (patch)
treec27eb251dd5637829ec2ce5c8d50f5298c13a1de /t/t3507-cherry-pick-conflict.sh
parentaad070922157d3249af7095ecff6ebc074c13bb9 (diff)
parent23cb5bf3b3b9699bf00fa38c4c08f32f8c60b529 (diff)
downloadgit-87a23e77c6ffc5713eff3a4a4da036731da2dc3f.zip
git-87a23e77c6ffc5713eff3a4a4da036731da2dc3f.tar.gz
git-87a23e77c6ffc5713eff3a4a4da036731da2dc3f.tar.bz2
Merge branch 'jc/advise-i18n'
* jc/advise-i18n: i18n of multi-line advice messages
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions