summaryrefslogtreecommitdiff
path: root/t/t3411-rebase-preserve-around-merges.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-14 07:10:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-14 07:10:50 (GMT)
commit4f8b8992ef0c009822cdca18d32ddf3a124ee284 (patch)
treed6688aedd217cdd9f46962af57432265e9b5ccff /t/t3411-rebase-preserve-around-merges.sh
parent885a1ffb936cb8e32a15413a9a2404a4b4200f62 (diff)
parent3d1d81eba29d5cfc5b214dc049b743ffbe032ef4 (diff)
downloadgit-4f8b8992ef0c009822cdca18d32ddf3a124ee284.zip
git-4f8b8992ef0c009822cdca18d32ddf3a124ee284.tar.gz
git-4f8b8992ef0c009822cdca18d32ddf3a124ee284.tar.bz2
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: fast-import: Cleanup mode setting. Git.pm: call Error::Simple() properly
Diffstat (limited to 't/t3411-rebase-preserve-around-merges.sh')
0 files changed, 0 insertions, 0 deletions