summaryrefslogtreecommitdiff
path: root/t/t3203-branch-output.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-23 05:14:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-23 05:14:51 (GMT)
commit120ce97f9dd098b1c469f8d1812d4885e020a6e9 (patch)
tree788c85f05d0357bc96a7950cdf73c8e4d87a8031 /t/t3203-branch-output.sh
parent5253ad109af7691d0b0fb3c9670aaaf775412c72 (diff)
parentb3e8ca89cfe34712a093c37fdbac7df7eaae91e7 (diff)
downloadgit-120ce97f9dd098b1c469f8d1812d4885e020a6e9.zip
git-120ce97f9dd098b1c469f8d1812d4885e020a6e9.tar.gz
git-120ce97f9dd098b1c469f8d1812d4885e020a6e9.tar.bz2
Merge branch 'jt/fast-export-copy-modify-fix' into maint
"git fast-export" with -M/-C option issued "copy" instruction on a path that is simultaneously modified, which was incorrect. * jt/fast-export-copy-modify-fix: fast-export: do not copy from modified file
Diffstat (limited to 't/t3203-branch-output.sh')
0 files changed, 0 insertions, 0 deletions