Merge lp:gcc-linaro/4.7 into lp:gcc-linaro
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Christophe Lyon | ||||
Proposed branch: | lp:gcc-linaro/4.7 | ||||
Merge into: | lp:gcc-linaro | ||||
Diff against target: |
1070718 lines (has conflicts)
Text conflict in ChangeLog Conflict adding file ChangeLog.linaro. Moved existing file to ChangeLog.linaro.moved. Text conflict in boehm-gc/ChangeLog Text conflict in config.guess Text conflict in config.sub Text conflict in config/ChangeLog Text conflict in configure Text conflict in configure.ac Text conflict in contrib/ChangeLog Text conflict in contrib/gennews Text conflict in contrib/reghunt/ChangeLog Text conflict in contrib/regression/ChangeLog Text conflict in fixincludes/ChangeLog Text conflict in fixincludes/fixincl.x Text conflict in gcc/BASE-VER Text conflict in gcc/ChangeLog Conflict adding file gcc/LINARO-VERSION. Moved existing file to gcc/LINARO-VERSION.moved. Text conflict in gcc/Makefile.in Text conflict in gcc/ada/ChangeLog Text conflict in gcc/ada/exp_disp.adb Text conflict in gcc/ada/gcc-interface/decl.c Text conflict in gcc/ada/gcc-interface/gigi.h Text conflict in gcc/ada/gcc-interface/trans.c Text conflict in gcc/ada/gcc-interface/utils.c Text conflict in gcc/ada/gnatlink.adb Text conflict in gcc/ada/link.c Text conflict in gcc/ada/mlib-utl.adb Text conflict in gcc/ada/s-gearop.adb Text conflict in gcc/ada/s-taprop-dummy.adb Text conflict in gcc/ada/seh_init.c Text conflict in gcc/alias.c Text conflict in gcc/basic-block.h Text conflict in gcc/builtins.c Contents conflict in gcc/c-convert.c Text conflict in gcc/c-family/ChangeLog Text conflict in gcc/c-family/c-lex.c Contents conflict in gcc/c-parser.c Contents conflict in gcc/c-typeck.c Text conflict in gcc/cfgcleanup.c Text conflict in gcc/cfgexpand.c Text conflict in gcc/cfgloop.h Text conflict in gcc/cgraph.c Text conflict in gcc/cgraph.h Text conflict in gcc/cgraphunit.c Text conflict in gcc/collect2.c Text conflict in gcc/collect2.h Text conflict in gcc/combine-stack-adj.c Conflict adding file gcc/common/config/aarch64. Moved existing file to gcc/common/config/aarch64.moved. Text conflict in gcc/common/config/m68k/m68k-common.c Text conflict in gcc/config.gcc Conflict adding file gcc/config/aarch64. Moved existing file to gcc/config/aarch64.moved. Text conflict in gcc/config/alpha/alpha.c Conflict adding file gcc/config/alpha/t-linux. Moved existing file to gcc/config/alpha/t-linux.moved. Text conflict in gcc/config/arm/arm-fixed.md Text conflict in gcc/config/arm/arm-protos.h Text conflict in gcc/config/arm/arm.c Text conflict in gcc/config/arm/arm.h Text conflict in gcc/config/arm/arm.md Text conflict in gcc/config/arm/arm1020e.md Text conflict in gcc/config/arm/arm1026ejs.md Text conflict in gcc/config/arm/arm1136jfs.md Text conflict in gcc/config/arm/arm926ejs.md Text conflict in gcc/config/arm/arm_neon.h Text conflict in gcc/config/arm/constraints.md Conflict adding file gcc/config/arm/cortex-a15-neon.md. Moved existing file to gcc/config/arm/cortex-a15-neon.md.moved. Text conflict in gcc/config/arm/cortex-a15.md Text conflict in gcc/config/arm/cortex-a5.md Conflict adding file gcc/config/arm/cortex-a7.md. Moved existing file to gcc/config/arm/cortex-a7.md.moved. Text conflict in gcc/config/arm/cortex-a8.md Text conflict in gcc/config/arm/cortex-a9.md Text conflict in gcc/config/arm/cortex-m4.md Text conflict in gcc/config/arm/cortex-r4.md Text conflict in gcc/config/arm/fa526.md Text conflict in gcc/config/arm/fa606te.md Text conflict in gcc/config/arm/fa626te.md Text conflict in gcc/config/arm/fa726te.md Text conflict in gcc/config/arm/fmp626.md Text conflict in gcc/config/arm/iterators.md Text conflict in gcc/config/arm/neon-docgen.ml Text conflict in gcc/config/arm/neon-gen.ml Text conflict in gcc/config/arm/neon-testgen.ml Text conflict in gcc/config/arm/neon.md Text conflict in gcc/config/arm/neon.ml Text conflict in gcc/config/arm/predicates.md Text conflict in gcc/config/arm/t-linux-eabi Text conflict in gcc/config/arm/thumb2.md Text conflict in gcc/config/arm/vfp.md Text conflict in gcc/config/avr/avr-c.c Text conflict in gcc/config/avr/avr-mcus.def Text conflict in gcc/config/avr/avr-protos.h Conflict adding file gcc/config/avr/avr-stdint.h. Moved existing file to gcc/config/avr/avr-stdint.h.moved. Text conflict in gcc/config/avr/avr.c Text conflict in gcc/config/avr/avr.h Text conflict in gcc/config/avr/avr.md Text conflict in gcc/config/avr/avr.opt Conflict adding file gcc/config/avr/avrlibc.h. Moved existing file to gcc/config/avr/avrlibc.h.moved. Text conflict in gcc/config/avr/builtins.def Text conflict in gcc/config/avr/t-avr Text conflict in gcc/config/avr/t-multilib Text conflict in gcc/config/darwin-c.c Text conflict in gcc/config/epiphany/epiphany.md Text conflict in gcc/config/fr30/fr30.md Text conflict in gcc/config/i386/constraints.md Text conflict in gcc/config/i386/driver-i386.c Text conflict in gcc/config/i386/fmaintrin.h Text conflict in gcc/config/i386/i386.c Text conflict in gcc/config/i386/i386.h Text conflict in gcc/config/i386/i386.md Text conflict in gcc/config/i386/nmmintrin.h Text conflict in gcc/config/i386/smmintrin.h Text conflict in gcc/config/i386/sse.md Text conflict in gcc/config/i386/sync.md Conflict adding file gcc/config/i386/t-gnu. Moved existing file to gcc/config/i386/t-gnu.moved. Conflict adding file gcc/config/i386/t-kfreebsd. Moved existing file to gcc/config/i386/t-kfreebsd.moved. Conflict adding file gcc/config/i386/t-linux. Moved existing file to gcc/config/i386/t-linux.moved. Text conflict in gcc/config/ia64/ia64.c Conflict adding file gcc/config/ia64/t-linux. Moved existing file to gcc/config/ia64/t-linux.moved. Text conflict in gcc/config/m68k/t-linux Conflict adding file gcc/config/microblaze/rtems.h. Moved existing file to gcc/config/microblaze/rtems.h.moved. Conflict adding file gcc/config/microblaze/t-rtems. Moved existing file to gcc/config/microblaze/t-rtems.moved. Contents conflict in gcc/config/mips/iris6.h Text conflict in gcc/config/pa/pa.c Text conflict in gcc/config/pa/pa.md Conflict adding file gcc/config/pa/t-linux. Moved existing file to gcc/config/pa/t-linux.moved. Conflict adding file gcc/config/rs6000/freebsd64.h. Moved existing file to gcc/config/rs6000/freebsd64.h.moved. Text conflict in gcc/config/rs6000/rs6000-builtin.def Text conflict in gcc/config/rs6000/rs6000.c Text conflict in gcc/config/rs6000/rs6000.md Text conflict in gcc/config/rs6000/t-fprules Conflict adding file gcc/config/rs6000/t-freebsd64. Moved existing file to gcc/config/rs6000/t-freebsd64.moved. Conflict adding file gcc/config/rs6000/t-linux. Moved existing file to gcc/config/rs6000/t-linux.moved. Text conflict in gcc/config/rs6000/t-linux64 Text conflict in gcc/config/sh/constraints.md Text conflict in gcc/config/sh/linux.h Text conflict in gcc/config/sh/predicates.md Text conflict in gcc/config/sh/sh-protos.h Text conflict in gcc/config/sh/sh.c Text conflict in gcc/config/sh/sh.h Text conflict in gcc/config/sh/sh.md Text conflict in gcc/config/sparc/sol2.h Text conflict in gcc/config/sparc/sparc.c Text conflict in gcc/config/sparc/sparc.h Conflict adding file gcc/config/sparc/t-linux. Moved existing file to gcc/config/sparc/t-linux.moved. Text conflict in gcc/config/sparc/t-linux64 Conflict adding file gcc/config/sparc/t-rtems-64. Moved existing file to gcc/config/sparc/t-rtems-64.moved. Conflict adding file gcc/config/sparc/t-rtems. Moved existing file to gcc/config/sparc/t-rtems.moved. Conflict adding file gcc/config/tilegx/feedback.h. Moved existing file to gcc/config/tilegx/feedback.h.moved. Text conflict in gcc/config/tilegx/sync.md Text conflict in gcc/config/tilegx/tilegx.md Conflict adding file gcc/config/tilepro/feedback.h. Moved existing file to gcc/config/tilepro/feedback.h.moved. Conflict adding file gcc/config/v850/rtems.h. Moved existing file to gcc/config/v850/rtems.h.moved. Conflict adding file gcc/config/v850/t-rtems. Moved existing file to gcc/config/v850/t-rtems.moved. Text conflict in gcc/config/v850/v850-modes.def Text conflict in gcc/configure Text conflict in gcc/configure.ac Text conflict in gcc/coverage.c Text conflict in gcc/cp/ChangeLog Text conflict in gcc/cp/call.c Text conflict in gcc/cp/class.c Text conflict in gcc/cp/cp-tree.h Text conflict in gcc/cp/cvt.c Text conflict in gcc/cp/decl.c Text conflict in gcc/cp/init.c Text conflict in gcc/cp/mangle.c Text conflict in gcc/cp/method.c Text conflict in gcc/cp/name-lookup.c Text conflict in gcc/cp/parser.c Text conflict in gcc/cp/pt.c Text conflict in gcc/cp/semantics.c Text conflict in gcc/cp/tree.c Text conflict in gcc/cp/typeck.c Text conflict in gcc/cppdefault.h Text conflict in gcc/cselib.h Text conflict in gcc/doc/extend.texi Text conflict in gcc/doc/fragments.texi Text conflict in gcc/doc/install.texi Text conflict in gcc/doc/invoke.texi Text conflict in gcc/doc/md.texi Text conflict in gcc/doc/sourcebuild.texi Text conflict in gcc/double-int.h Text conflict in gcc/dwarf2out.c Text conflict in gcc/emit-rtl.c Text conflict in gcc/explow.c Text conflict in gcc/expmed.c Text conflict in gcc/expr.c Text conflict in gcc/flag-types.h Text conflict in gcc/fortran/ChangeLog Text conflict in gcc/fortran/frontend-passes.c Text conflict in gcc/fortran/gfortran.h Text conflict in gcc/fortran/match.c Text conflict in gcc/fortran/resolve.c Text conflict in gcc/fortran/trans-expr.c Text conflict in gcc/fortran/trans-types.c Text conflict in gcc/gcc-ar.c Text conflict in gcc/gcc.c Text conflict in gcc/gcse.c Text conflict in gcc/genmultilib Text conflict in gcc/ggc-page.c Text conflict in gcc/gimple-fold.c Text conflict in gcc/gimple.c Text conflict in gcc/gimple.h Text conflict in gcc/go/ChangeLog Text conflict in gcc/go/gccgo.texi Text conflict in gcc/go/go-c.h Text conflict in gcc/go/go-gcc.cc Text conflict in gcc/go/gofrontend/backend.h Text conflict in gcc/go/gofrontend/expressions.cc Text conflict in gcc/go/gofrontend/expressions.h Text conflict in gcc/go/gofrontend/gogo-tree.cc Text conflict in gcc/go/gofrontend/gogo.cc Text conflict in gcc/go/gofrontend/gogo.h Text conflict in gcc/go/gofrontend/parse.cc Text conflict in gcc/go/gofrontend/parse.h Text conflict in gcc/go/gofrontend/types.cc Text conflict in gcc/go/lang.opt Text conflict in gcc/godump.c Text conflict in gcc/graphite-dependences.c Text conflict in gcc/haifa-sched.c Text conflict in gcc/ifcvt.c Text conflict in gcc/incpath.c Text conflict in gcc/ipa-inline-analysis.c Text conflict in gcc/ipa-inline-transform.c Text conflict in gcc/ipa-inline.c Text conflict in gcc/ipa-split.c Text conflict in gcc/ipa.c Text conflict in gcc/ira-build.c Text conflict in gcc/java/ChangeLog Text conflict in gcc/lto-streamer.h Text conflict in gcc/lto/ChangeLog Text conflict in gcc/lto/lto.c Text conflict in gcc/objc/ChangeLog Text conflict in gcc/objc/objc-next-runtime-abi-01.c Text conflict in gcc/objcp/ChangeLog Text conflict in gcc/omp-low.c Text conflict in gcc/optabs.c Text conflict in gcc/params.def Text conflict in gcc/po/ChangeLog Text conflict in gcc/po/be.po Text conflict in gcc/po/da.po Text conflict in gcc/po/de.po Text conflict in gcc/po/el.po Text conflict in gcc/po/es.po Text conflict in gcc/po/fi.po Text conflict in gcc/po/fr.po Text conflict in gcc/po/gcc.pot Conflict adding file gcc/po/hr.po. Moved existing file to gcc/po/hr.po.moved. Text conflict in gcc/po/id.po Text conflict in gcc/po/ja.po Text conflict in gcc/po/nl.po Text conflict in gcc/po/ru.po Text conflict in gcc/po/sr.po Text conflict in gcc/po/sv.po Text conflict in gcc/po/tr.po Text conflict in gcc/po/vi.po Text conflict in gcc/po/zh_CN.po Text conflict in gcc/po/zh_TW.po Text conflict in gcc/read-rtl.c Text conflict in gcc/reload.c Text conflict in gcc/sched-deps.c Text conflict in gcc/sel-sched-ir.c Text conflict in gcc/sel-sched.c Text conflict in gcc/simplify-rtx.c Text conflict in gcc/stor-layout.c Text conflict in gcc/testsuite/ChangeLog Conflict adding file gcc/testsuite/c-c++-common/array-lit.c. Moved existing file to gcc/testsuite/c-c++-common/array-lit.c.moved. Conflict adding file gcc/testsuite/c-c++-common/gomp/pr53580.c. Moved existing file to gcc/testsuite/c-c++-common/gomp/pr53580.c.moved. Conflict adding file gcc/testsuite/c-c++-common/gomp/pr54017.c. Moved existing file to gcc/testsuite/c-c++-common/gomp/pr54017.c.moved. Conflict adding file gcc/testsuite/c-c++-common/pr33763.c. Moved existing file to gcc/testsuite/c-c++-common/pr33763.c.moved. Conflict adding file gcc/testsuite/c-c++-common/pr54486.c. Moved existing file to gcc/testsuite/c-c++-common/pr54486.c.moved. Conflict adding file gcc/testsuite/c-c++-common/pr54988.c. Moved existing file to gcc/testsuite/c-c++-common/pr54988.c.moved. Text conflict in gcc/testsuite/c-c++-common/raw-string-3.c Text conflict in gcc/testsuite/c-c++-common/raw-string-4.c Text conflict in gcc/testsuite/c-c++-common/raw-string-5.c Conflict adding file gcc/testsuite/c-c++-common/torture/pr53505.c. Moved existing file to gcc/testsuite/c-c++-common/torture/pr53505.c.moved. Conflict adding file gcc/testsuite/g++.dg/abi/aarch64_guard1.C. Moved existing file to gcc/testsuite/g++.dg/abi/aarch64_guard1.C.moved. Conflict adding file gcc/testsuite/g++.dg/abi/anon1.C. Moved existing file to gcc/testsuite/g++.dg/abi/anon1.C.moved. Conflict adding file gcc/testsuite/g++.dg/abi/mangle-neon-aarch64.C. Moved existing file to gcc/testsuite/g++.dg/abi/mangle-neon-aarch64.C.moved. Conflict adding file gcc/testsuite/g++.dg/abi/mangle61.C. Moved existing file to gcc/testsuite/g++.dg/abi/mangle61.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/alias-decl-20.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/alias-decl-20.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/auto32.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/auto32.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/auto33.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/auto33.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-52672.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-52672.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr8.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-array-ptr8.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-const1.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-const1.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-ctor11.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-ctor12.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-ctor12.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-initlist6.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-initlist6.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-ref4.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-temp1.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-temp1.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-tuple.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-tuple.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-virtual2.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-virtual2.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-virtual3.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-virtual3.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/constexpr-virtual4.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/constexpr-virtual4.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/decltype37.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/decltype37.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/decltype38.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/decltype38.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/decltype48.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/decltype48.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/defaulted36.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/defaulted36.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/fntmpdefarg4.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/fntmpdefarg4.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/forw_enum11.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/forw_enum11.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/implicit13.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/implicit13.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/implicit14.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/implicit14.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/initlist-array3.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/initlist-array3.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/initlist-ctor1.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/initlist-ctor1.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/initlist-defarg1.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/initlist-defarg1.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/initlist-protected.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/initlist-protected.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/initlist-pure.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/initlist-pure.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv6.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv7.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-conv7.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh3.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh3.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist2.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-initlist2.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nullptr.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nullptr.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-return1.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-return1.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template5.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template5.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template6.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template6.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template9.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template9.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this6.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this6.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this7.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this8.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this8.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this9.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/lambda/lambda-this9.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/noexcept18.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/noexcept18.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/noexcept19.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/noexcept19.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/noexcept20.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/noexcept20.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/nsdmi7.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/nsdmi7.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/nullptr28.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/nullptr28.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/nullptr29.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/nullptr29.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/pr52841.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/pr52841.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/range-for24.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/range-for24.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/trailing9.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/trailing9.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/udlit-args2.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/udlit-args2.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/udlit-mangle.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic-explicit2.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic-explicit2.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic-value1.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic-value1.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic123.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic123.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic124.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic124.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic125.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic125.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic128.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic128.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic129.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic129.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic131.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic131.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic132.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic132.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic133.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic133.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/variadic134.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/variadic134.C.moved. Conflict adding file gcc/testsuite/g++.dg/cpp0x/vt-55542.C. Moved existing file to gcc/testsuite/g++.dg/cpp0x/vt-55542.C.moved. Conflict adding file gcc/testsuite/g++.dg/debug/dwarf2/localclass3.C. Moved existing file to gcc/testsuite/g++.dg/debug/dwarf2/localclass3.C.moved. Conflict adding file gcc/testsuite/g++.dg/debug/dwarf2/namespace-2.C. Moved existing file to gcc/testsuite/g++.dg/debug/dwarf2/namespace-2.C.moved. Conflict adding file gcc/testsuite/g++.dg/debug/localclass1.C. Moved existing file to gcc/testsuite/g++.dg/debug/localclass1.C.moved. Conflict adding file gcc/testsuite/g++.dg/debug/pr54828.C. Moved existing file to gcc/testsuite/g++.dg/debug/pr54828.C.moved. Conflict adding file gcc/testsuite/g++.dg/debug/pr56819.C. Moved existing file to gcc/testsuite/g++.dg/debug/pr56819.C.moved. Conflict adding file gcc/testsuite/g++.dg/debug/template2.C. Moved existing file to gcc/testsuite/g++.dg/debug/template2.C.moved. Conflict adding file gcc/testsuite/g++.dg/expr/const1.C. Moved existing file to gcc/testsuite/g++.dg/expr/const1.C.moved. Conflict adding file gcc/testsuite/g++.dg/ext/attrib44.C. Moved existing file to gcc/testsuite/g++.dg/ext/attrib44.C.moved. Conflict adding file gcc/testsuite/g++.dg/ext/attrib45.C. Moved existing file to gcc/testsuite/g++.dg/ext/attrib45.C.moved. Conflict adding file gcc/testsuite/g++.dg/ext/has_nothrow_constructor-2.C. Moved existing file to gcc/testsuite/g++.dg/ext/has_nothrow_constructor-2.C.moved. Conflict adding file gcc/testsuite/g++.dg/ext/has_nothrow_copy-8.C. Moved existing file to gcc/testsuite/g++.dg/ext/has_nothrow_copy-8.C.moved. Conflict adding file gcc/testsuite/g++.dg/ext/pr53605.C. Moved existing file to gcc/testsuite/g++.dg/ext/pr53605.C.moved. Conflict adding file gcc/testsuite/g++.dg/ext/visibility/anon11.C. Moved existing file to gcc/testsuite/g++.dg/ext/visibility/anon11.C.moved. Conflict adding file gcc/testsuite/g++.dg/ext/visibility/template12.C. Moved existing file to gcc/testsuite/g++.dg/ext/visibility/template12.C.moved. Conflict adding file gcc/testsuite/g++.dg/ext/weak4.C. Moved existing file to gcc/testsuite/g++.dg/ext/weak4.C.moved. Conflict adding file gcc/testsuite/g++.dg/gomp/pr56217.C. Moved existing file to gcc/testsuite/g++.dg/gomp/pr56217.C.moved. Conflict adding file gcc/testsuite/g++.dg/init/aggr9.C. Moved existing file to gcc/testsuite/g++.dg/init/aggr9.C.moved. Conflict adding file gcc/testsuite/g++.dg/init/array33.C. Moved existing file to gcc/testsuite/g++.dg/init/array33.C.moved. Conflict adding file gcc/testsuite/g++.dg/init/array34.C. Moved existing file to gcc/testsuite/g++.dg/init/array34.C.moved. Conflict adding file gcc/testsuite/g++.dg/init/const9.C. Moved existing file to gcc/testsuite/g++.dg/init/const9.C.moved. Conflict adding file gcc/testsuite/g++.dg/init/lifetime3.C. Moved existing file to gcc/testsuite/g++.dg/init/lifetime3.C.moved. Conflict adding file gcc/testsuite/g++.dg/init/mutable1.C. Moved existing file to gcc/testsuite/g++.dg/init/mutable1.C.moved. Conflict adding file gcc/testsuite/g++.dg/init/new33.C. Moved existing file to gcc/testsuite/g++.dg/init/new33.C.moved. Conflict adding file gcc/testsuite/g++.dg/init/new41.C. Moved existing file to gcc/testsuite/g++.dg/init/new41.C.moved. Conflict adding file gcc/testsuite/g++.dg/ipa/pr52939.C. Moved existing file to gcc/testsuite/g++.dg/ipa/pr52939.C.moved. Conflict adding file gcc/testsuite/g++.dg/ipa/pr55264.C. Moved existing file to gcc/testsuite/g++.dg/ipa/pr55264.C.moved. Conflict adding file gcc/testsuite/g++.dg/lookup/using52.C. Moved existing file to gcc/testsuite/g++.dg/lookup/using52.C.moved. Conflict adding file gcc/testsuite/g++.dg/lto/pr52605_0.C. Moved existing file to gcc/testsuite/g++.dg/lto/pr52605_0.C.moved. Conflict adding file gcc/testsuite/g++.dg/lto/pr53470_0.C. Moved existing file to gcc/testsuite/g++.dg/lto/pr53470_0.C.moved. Conflict adding file gcc/testsuite/g++.dg/opt/pr52582.C. Moved existing file to gcc/testsuite/g++.dg/opt/pr52582.C.moved. Conflict adding file gcc/testsuite/g++.dg/opt/pr52727.C. Moved existing file to gcc/testsuite/g++.dg/opt/pr52727.C.moved. Conflict adding file gcc/testsuite/g++.dg/opt/pr55331.C. Moved existing file to gcc/testsuite/g++.dg/opt/pr55331.C.moved. Conflict adding file gcc/testsuite/g++.dg/opt/vrp3-aux.cc. Moved existing file to gcc/testsuite/g++.dg/opt/vrp3-aux.cc.moved. Conflict adding file gcc/testsuite/g++.dg/opt/vrp3.C. Moved existing file to gcc/testsuite/g++.dg/opt/vrp3.C.moved. Conflict adding file gcc/testsuite/g++.dg/opt/vrp3.h. Moved existing file to gcc/testsuite/g++.dg/opt/vrp3.h.moved. Conflict adding file gcc/testsuite/g++.dg/other/array7.C. Moved existing file to gcc/testsuite/g++.dg/other/array7.C.moved. Conflict adding file gcc/testsuite/g++.dg/other/final2.C. Moved existing file to gcc/testsuite/g++.dg/other/final2.C.moved. Conflict adding file gcc/testsuite/g++.dg/other/pr53811.C. Moved existing file to gcc/testsuite/g++.dg/other/pr53811.C.moved. Conflict adding file gcc/testsuite/g++.dg/overload/virtual2.C. Moved existing file to gcc/testsuite/g++.dg/overload/virtual2.C.moved. Conflict adding file gcc/testsuite/g++.dg/parse/crash59.C. Moved existing file to gcc/testsuite/g++.dg/parse/crash59.C.moved. Conflict adding file gcc/testsuite/g++.dg/parse/crash60.C. Moved existing file to gcc/testsuite/g++.dg/parse/crash60.C.moved. Conflict adding file gcc/testsuite/g++.dg/parse/crash61.C. Moved existing file to gcc/testsuite/g++.dg/parse/crash61.C.moved. Conflict adding file gcc/testsuite/g++.dg/parse/enum9.C. Moved existing file to gcc/testsuite/g++.dg/parse/enum9.C.moved. Conflict adding file gcc/testsuite/g++.dg/parse/new6.C. Moved existing file to gcc/testsuite/g++.dg/parse/new6.C.moved. Conflict adding file gcc/testsuite/g++.dg/parse/pr56239.C. Moved existing file to gcc/testsuite/g++.dg/parse/pr56239.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/anonunion2.C. Moved existing file to gcc/testsuite/g++.dg/template/anonunion2.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/array23.C. Moved existing file to gcc/testsuite/g++.dg/template/array23.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/array24.C. Moved existing file to gcc/testsuite/g++.dg/template/array24.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/array25.C. Moved existing file to gcc/testsuite/g++.dg/template/array25.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/array26.C. Moved existing file to gcc/testsuite/g++.dg/template/array26.C.moved. Text conflict in gcc/testsuite/g++.dg/template/crash108.C Conflict adding file gcc/testsuite/g++.dg/template/crash115.C. Moved existing file to gcc/testsuite/g++.dg/template/crash115.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/current-inst1.C. Moved existing file to gcc/testsuite/g++.dg/template/current-inst1.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/delete2.C. Moved existing file to gcc/testsuite/g++.dg/template/delete2.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/error49.C. Moved existing file to gcc/testsuite/g++.dg/template/error49.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/inherit8.C. Moved existing file to gcc/testsuite/g++.dg/template/inherit8.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/inherit9.C. Moved existing file to gcc/testsuite/g++.dg/template/inherit9.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/init10.C. Moved existing file to gcc/testsuite/g++.dg/template/init10.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/local7.C. Moved existing file to gcc/testsuite/g++.dg/template/local7.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/meminit3.C. Moved existing file to gcc/testsuite/g++.dg/template/meminit3.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/new11.C. Moved existing file to gcc/testsuite/g++.dg/template/new11.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/pr54858.C. Moved existing file to gcc/testsuite/g++.dg/template/pr54858.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/ptrmem23.C. Moved existing file to gcc/testsuite/g++.dg/template/ptrmem23.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/qualified-id5.C. Moved existing file to gcc/testsuite/g++.dg/template/qualified-id5.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/ref6.C. Moved existing file to gcc/testsuite/g++.dg/template/ref6.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/typedef39.C. Moved existing file to gcc/testsuite/g++.dg/template/typedef39.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/typedef40.C. Moved existing file to gcc/testsuite/g++.dg/template/typedef40.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/typename19.C. Moved existing file to gcc/testsuite/g++.dg/template/typename19.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/typename20.C. Moved existing file to gcc/testsuite/g++.dg/template/typename20.C.moved. Conflict adding file gcc/testsuite/g++.dg/template/using23.C. Moved existing file to gcc/testsuite/g++.dg/template/using23.C.moved. Conflict adding file gcc/testsuite/g++.dg/tm/pr47530-2.C. Moved existing file to gcc/testsuite/g++.dg/tm/pr47530-2.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/20121105-1.C. Moved existing file to gcc/testsuite/g++.dg/torture/20121105-1.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr52582.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr52582.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr53085.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr53085.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr53364.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr53364.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr53602.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr53602.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr53693.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr53693.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr53752.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr53752.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr54563.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr54563.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr54684.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr54684.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr54735.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr54735.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr54902.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr54902.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr55355.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr55355.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr56403.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr56403.C.moved. Conflict adding file gcc/testsuite/g++.dg/torture/pr56768.C. Moved existing file to gcc/testsuite/g++.dg/torture/pr56768.C.moved. Text conflict in gcc/testsuite/g++.dg/torture/stackalign/stackalign.exp Conflict adding file gcc/testsuite/g++.dg/tree-prof/pr53460.C. Moved existing file to gcc/testsuite/g++.dg/tree-prof/pr53460.C.moved. Conflict adding file gcc/testsuite/g++.dg/tree-ssa/pr54515.C. Moved existing file to gcc/testsuite/g++.dg/tree-ssa/pr54515.C.moved. Conflict adding file gcc/testsuite/g++.dg/warn/Wenum-compare-no-2.C. Moved existing file to gcc/testsuite/g++.dg/warn/Wenum-compare-no-2.C.moved. Conflict adding file gcc/testsuite/g++.dg/warn/Wreturn-type-8.C. Moved existing file to gcc/testsuite/g++.dg/warn/Wreturn-type-8.C.moved. Conflict adding file gcc/testsuite/g++.dg/warn/Wunused-var-19.C. Moved existing file to gcc/testsuite/g++.dg/warn/Wunused-var-19.C.moved. Conflict adding file gcc/testsuite/g++.dg/warn/Wzero-as-null-pointer-constant-5.C. Moved existing file to gcc/testsuite/g++.dg/warn/Wzero-as-null-pointer-constant-5.C.moved. Conflict adding file gcc/testsuite/g++.dg/warn/Wzero-as-null-pointer-constant-6.C. Moved existing file to gcc/testsuite/g++.dg/warn/Wzero-as-null-pointer-constant-6.C.moved. Conflict adding file gcc/testsuite/g++.dg/warn/pmf2.C. Moved existing file to gcc/testsuite/g++.dg/warn/pmf2.C.moved. Text conflict in gcc/testsuite/g++.old-deja/g++.jason/enum6.C Text conflict in gcc/testsuite/g++.old-deja/g++.law/enum9.C Text conflict in gcc/testsuite/g++.old-deja/g++.other/enum4.C Conflict adding file gcc/testsuite/gcc.c-torture/compile/20121107-1.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/20121107-1.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr52750.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr52750.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr52891-1.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr52891-1.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr52891-2.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr52891-2.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr52979-1.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr52979-1.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr53163.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr53163.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr53187.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr53187.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr53409.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr53409.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr53410-1.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr53410-1.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr53410-2.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr53410-2.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr53418-1.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr53418-1.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr53418-2.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr53418-2.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr53519.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr53519.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr54103-1.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr54103-1.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr54103-2.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr54103-2.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr54103-3.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr54103-3.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr54103-4.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr54103-4.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr54103-5.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr54103-5.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr54103-6.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr54103-6.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr54428.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr54428.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr54552-1.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr54552-1.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr54559.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr54559.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr55921.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr55921.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr56484.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr56484.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/compile/pr56539.c. Moved existing file to gcc/testsuite/gcc.c-torture/compile/pr56539.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/20120427-1.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/20120427-1.c.moved. Text conflict in gcc/testsuite/gcc.c-torture/execute/builtins/builtins.exp Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr52979-1.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr52979-1.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr52979-2.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr52979-2.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr53084.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr53084.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr53160.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr53160.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr53465.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr53465.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr54985.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr54985.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr56051.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr56051.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr56250.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr56250.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr56866.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr56866.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr57568.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr57568.c.moved. Conflict adding file gcc/testsuite/gcc.c-torture/execute/pr57829.c. Moved existing file to gcc/testsuite/gcc.c-torture/execute/pr57829.c.moved. Conflict adding file gcc/testsuite/gcc.dg/54455.c. Moved existing file to gcc/testsuite/gcc.dg/54455.c.moved. Text conflict in gcc/testsuite/gcc.dg/Wstrict-aliasing-converted-assigned.c Conflict adding file gcc/testsuite/gcc.dg/Wunused-var-3.c. Moved existing file to gcc/testsuite/gcc.dg/Wunused-var-3.c.moved. Conflict adding file gcc/testsuite/gcc.dg/builtin-unreachable-5.c. Moved existing file to gcc/testsuite/gcc.dg/builtin-unreachable-5.c.moved. Conflict adding file gcc/testsuite/gcc.dg/builtin-unreachable-6.c. Moved existing file to gcc/testsuite/gcc.dg/builtin-unreachable-6.c.moved. Text conflict in gcc/testsuite/gcc.dg/cpp/pr28709.c Conflict adding file gcc/testsuite/gcc.dg/gomp/pr53992.c. Moved existing file to gcc/testsuite/gcc.dg/gomp/pr53992.c.moved. Text conflict in gcc/testsuite/gcc.dg/lower-subreg-1.c Conflict adding file gcc/testsuite/gcc.dg/lto/pr53214_0.c. Moved existing file to gcc/testsuite/gcc.dg/lto/pr53214_0.c.moved. Conflict adding file gcc/testsuite/gcc.dg/lto/pr53470_0.c. Moved existing file to gcc/testsuite/gcc.dg/lto/pr53470_0.c.moved. Conflict adding file gcc/testsuite/gcc.dg/lto/pr55660_0.c. Moved existing file to gcc/testsuite/gcc.dg/lto/pr55660_0.c.moved. Conflict adding file gcc/testsuite/gcc.dg/lto/pr55660_1.c. Moved existing file to gcc/testsuite/gcc.dg/lto/pr55660_1.c.moved. Conflict adding files to gcc/testsuite/gcc.dg/matrix. Created directory. Conflict because gcc/testsuite/gcc.dg/matrix is not versioned, but has versioned children. Versioned directory. Contents conflict in gcc/testsuite/gcc.dg/matrix/matrix.exp Conflict adding file gcc/testsuite/gcc.dg/pr44061.c. Moved existing file to gcc/testsuite/gcc.dg/pr44061.c.moved. Text conflict in gcc/testsuite/gcc.dg/pr44194-1.c Conflict adding file gcc/testsuite/gcc.dg/pr45472.c. Moved existing file to gcc/testsuite/gcc.dg/pr45472.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr48189.c. Moved existing file to gcc/testsuite/gcc.dg/pr48189.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr49069.c. Moved existing file to gcc/testsuite/gcc.dg/pr49069.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr52592.c. Moved existing file to gcc/testsuite/gcc.dg/pr52592.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr52691.c. Moved existing file to gcc/testsuite/gcc.dg/pr52691.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr52734.c. Moved existing file to gcc/testsuite/gcc.dg/pr52734.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr52862.c. Moved existing file to gcc/testsuite/gcc.dg/pr52862.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr52880.c. Moved existing file to gcc/testsuite/gcc.dg/pr52880.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr53060.c. Moved existing file to gcc/testsuite/gcc.dg/pr53060.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr53174.c. Moved existing file to gcc/testsuite/gcc.dg/pr53174.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr53358.c. Moved existing file to gcc/testsuite/gcc.dg/pr53358.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr53550.c. Moved existing file to gcc/testsuite/gcc.dg/pr53550.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr53701.c. Moved existing file to gcc/testsuite/gcc.dg/pr53701.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr53942.c. Moved existing file to gcc/testsuite/gcc.dg/pr53942.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr54121.c. Moved existing file to gcc/testsuite/gcc.dg/pr54121.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr54363.c. Moved existing file to gcc/testsuite/gcc.dg/pr54363.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr55019.c. Moved existing file to gcc/testsuite/gcc.dg/pr55019.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr55094.c. Moved existing file to gcc/testsuite/gcc.dg/pr55094.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr55110.c. Moved existing file to gcc/testsuite/gcc.dg/pr55110.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr55236.c. Moved existing file to gcc/testsuite/gcc.dg/pr55236.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr55570.c. Moved existing file to gcc/testsuite/gcc.dg/pr55570.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr55838.c. Moved existing file to gcc/testsuite/gcc.dg/pr55838.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr55940.c. Moved existing file to gcc/testsuite/gcc.dg/pr55940.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr56023.c. Moved existing file to gcc/testsuite/gcc.dg/pr56023.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr56098-1.c. Moved existing file to gcc/testsuite/gcc.dg/pr56098-1.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr56125.c. Moved existing file to gcc/testsuite/gcc.dg/pr56125.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr56275.c. Moved existing file to gcc/testsuite/gcc.dg/pr56275.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr56350.c. Moved existing file to gcc/testsuite/gcc.dg/pr56350.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr56510.c. Moved existing file to gcc/testsuite/gcc.dg/pr56510.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr56890-1.c. Moved existing file to gcc/testsuite/gcc.dg/pr56890-1.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr56890-2.c. Moved existing file to gcc/testsuite/gcc.dg/pr56890-2.c.moved. Conflict adding file gcc/testsuite/gcc.dg/pr57980.c. Moved existing file to gcc/testsuite/gcc.dg/pr57980.c.moved. Conflict adding file gcc/testsuite/gcc.dg/split-6.c. Moved existing file to gcc/testsuite/gcc.dg/split-6.c.moved. Text conflict in gcc/testsuite/gcc.dg/stack-usage-1.c Conflict adding file gcc/testsuite/gcc.dg/tm/indirect-2.c. Moved existing file to gcc/testsuite/gcc.dg/tm/indirect-2.c.moved. Conflict adding file gcc/testsuite/gcc.dg/tm/pr53008.c. Moved existing file to gcc/testsuite/gcc.dg/tm/pr53008.c.moved. Conflict adding file gcc/testsuite/gcc.dg/tm/reg-promotion.c. Moved existing file to gcc/testsuite/gcc.dg/tm/reg-promotion.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr48124-1.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr48124-1.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr48124-2.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr48124-2.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr48124-3.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr48124-3.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr48124-4.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr48124-4.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr48493.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr48493.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr51071-2.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr51071-2.c.moved. Text conflict in gcc/testsuite/gcc.dg/torture/pr52402.c Conflict adding file gcc/testsuite/gcc.dg/torture/pr52406.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr52406.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr52493.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr52493.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr52693.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr52693.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr52720.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr52720.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr52943.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr52943.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr52969.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr52969.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53120.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53120.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53144.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53144.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53272-1.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53272-1.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53272-2.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53272-2.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53366-1.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53366-1.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53366-2.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53366-2.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53408.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53408.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53501.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53501.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53516.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53516.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53589.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53589.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53663-1.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53663-1.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53663-2.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53663-2.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53663-3.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53663-3.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53790.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53790.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53908.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53908.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr53922.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr53922.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr54127.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr54127.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr54436.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr54436.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr54877.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr54877.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr54894.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr54894.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr54920.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr54920.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr55107.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr55107.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr55481.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr55481.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr55755.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr55755.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr55882.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr55882.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr55890-1.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr55890-1.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr55890-2.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr55890-2.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr55890-3.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr55890-3.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr56443.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr56443.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr56488.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr56488.c.moved. Conflict adding file gcc/testsuite/gcc.dg/torture/pr56501.c. Moved existing file to gcc/testsuite/gcc.dg/torture/pr56501.c.moved. Text conflict in gcc/testsuite/gcc.dg/torture/stackalign/stackalign.exp Conflict adding file gcc/testsuite/gcc.dg/tree-ssa/sra-13.c. Moved existing file to gcc/testsuite/gcc.dg/tree-ssa/sra-13.c.moved. Conflict adding file gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c. Moved existing file to gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/bb-slp-pattern-1.c. Moved existing file to gcc/testsuite/gcc.dg/vect/bb-slp-pattern-1.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/bb-slp-pattern-2.c. Moved existing file to gcc/testsuite/gcc.dg/vect/bb-slp-pattern-2.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-3.c. Moved existing file to gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-3.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/pr52870.c. Moved existing file to gcc/testsuite/gcc.dg/vect/pr52870.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/slp-38.c. Moved existing file to gcc/testsuite/gcc.dg/vect/slp-38.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/slp-cond-3.c. Moved existing file to gcc/testsuite/gcc.dg/vect/slp-cond-3.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/slp-cond-4.c. Moved existing file to gcc/testsuite/gcc.dg/vect/slp-cond-4.c.moved. Text conflict in gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c Text conflict in gcc/testsuite/gcc.dg/vect/vect-outer-1.c Text conflict in gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c Text conflict in gcc/testsuite/gcc.dg/vect/vect-outer-1a.c Text conflict in gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c Text conflict in gcc/testsuite/gcc.dg/vect/vect-outer-1b.c Text conflict in gcc/testsuite/gcc.dg/vect/vect-outer-2b.c Text conflict in gcc/testsuite/gcc.dg/vect/vect-outer-3b.c Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-btrunc.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-btrunc.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-btruncf.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-btruncf.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-ceil.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-ceil.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-ceilf.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-ceilf.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-floor.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-floor.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-floorf.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-floorf.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-lceil.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-lceil.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-lfloor.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-lfloor.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyint.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyint.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyintf.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyintf.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-round.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-round.c.moved. Conflict adding file gcc/testsuite/gcc.dg/vect/vect-rounding-roundf.c. Moved existing file to gcc/testsuite/gcc.dg/vect/vect-rounding-roundf.c.moved. Conflict adding file gcc/testsuite/gcc.target/aarch64. Moved existing file to gcc/testsuite/gcc.target/aarch64.moved. Conflict adding file gcc/testsuite/gcc.target/arm/builtin-bswap-1.c. Moved existing file to gcc/testsuite/gcc.target/arm/builtin-bswap-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/builtin-bswap16-1.c. Moved existing file to gcc/testsuite/gcc.target/arm/builtin-bswap16-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-extend-1.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-extend-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-extend-2.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-extend-2.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-for-64bits-1.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-for-64bits-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-1.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-10.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-10.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-11.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-11.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-12.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-12.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-13.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-13.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-14.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-14.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-15.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-15.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-16.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-16.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-17.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-17.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-18.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-18.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-19.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-19.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-2.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-2.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-3.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-3.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-4.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-4.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-5.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-5.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-6.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-6.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-7.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-7.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-8.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-8.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vdup-9.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vdup-9.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vext-execute.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vext-execute.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vext.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vext.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/neon-vrev.c. Moved existing file to gcc/testsuite/gcc.target/arm/neon-vrev.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr52633.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr52633.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr52686.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr52686.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr53187.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr53187.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr53447-1.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr53447-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr53447-2.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr53447-2.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr53447-3.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr53447-3.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr53447-4.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr53447-4.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr53636.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr53636.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr54892.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr54892.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/pr55642.c. Moved existing file to gcc/testsuite/gcc.target/arm/pr55642.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/sat-1.c. Moved existing file to gcc/testsuite/gcc.target/arm/sat-1.c.moved. Text conflict in gcc/testsuite/gcc.target/arm/synchronize.c Conflict adding file gcc/testsuite/gcc.target/arm/thumb-16bit-ops.c. Moved existing file to gcc/testsuite/gcc.target/arm/thumb-16bit-ops.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/thumb-find-work-register.c. Moved existing file to gcc/testsuite/gcc.target/arm/thumb-find-work-register.c.moved. Conflict adding file gcc/testsuite/gcc.target/arm/thumb-ifcvt.c. Moved existing file to gcc/testsuite/gcc.target/arm/thumb-ifcvt.c.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-1-0.c. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-1-0.c.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-1-g.c. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-1-g.c.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-1-x.c. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-1-x.c.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-1.h. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-1.h.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-2-0.c. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-2-0.c.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-2-g.c. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-2-g.c.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-2-x.c. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-2-x.c.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/addr-space-2.h. Moved existing file to gcc/testsuite/gcc.target/avr/torture/addr-space-2.h.moved. Conflict adding file gcc/testsuite/gcc.target/avr/torture/builtins-2.c. Moved existing file to gcc/testsuite/gcc.target/avr/torture/builtins-2.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/builtin-bswap-4.c. Moved existing file to gcc/testsuite/gcc.target/i386/builtin-bswap-4.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/clearcapv2.map. Moved existing file to gcc/testsuite/gcc.target/i386/clearcapv2.map.moved. Conflict adding file gcc/testsuite/gcc.target/i386/movsd.c. Moved existing file to gcc/testsuite/gcc.target/i386/movsd.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr44578.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr44578.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr46254.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr46254.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr52736.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr52736.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr52754.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr52754.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr53366-1.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr53366-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr53366-2.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr53366-2.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr53416.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr53416.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr53759.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr53759.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr54157.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr54157.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr54703.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr54703.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr55142-1.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr55142-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr55142-2.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr55142-2.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr55597.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr55597.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr56028.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr56028.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr56560.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr56560.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr56866.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr56866.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr57098.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr57098.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr57264.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr57264.c.moved. Conflict adding file gcc/testsuite/gcc.target/i386/pr57655.c. Moved existing file to gcc/testsuite/gcc.target/i386/pr57655.c.moved. Conflict adding file gcc/testsuite/gcc.target/ia64/pr48496.c. Moved existing file to gcc/testsuite/gcc.target/ia64/pr48496.c.moved. Conflict adding file gcc/testsuite/gcc.target/ia64/pr52657.c. Moved existing file to gcc/testsuite/gcc.target/ia64/pr52657.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/lhs-1.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/lhs-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/lhs-2.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/lhs-2.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/lhs-3.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/lhs-3.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/pr52457.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/pr52457.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/pr52775.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/pr52775.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/pr53199.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/pr53199.c.moved. Conflict adding file gcc/testsuite/gcc.target/powerpc/pr57150.c. Moved existing file to gcc/testsuite/gcc.target/powerpc/pr57150.c.moved. Conflict adding file gcc/testsuite/gcc.target/sh/pr49880-1.c. Moved existing file to gcc/testsuite/gcc.target/sh/pr49880-1.c.moved. Conflict adding file gcc/testsuite/gcc.target/sh/pr49880-2.c. Moved existing file to gcc/testsuite/gcc.target/sh/pr49880-2.c.moved. Conflict adding file gcc/testsuite/gcc.target/sh/pr49880-3.c. Moved existing file to gcc/testsuite/gcc.target/sh/pr49880-3.c.moved. Conflict adding file gcc/testsuite/gcc.target/sh/pr49880-4.c. Moved existing file to gcc/testsuite/gcc.target/sh/pr49880-4.c.moved. Conflict adding file gcc/testsuite/gcc.target/sh/pr49880-5.c. Moved existing file to gcc/testsuite/gcc.target/sh/pr49880-5.c.moved. Conflict adding file gcc/testsuite/gcc.target/sh/pr57108.c. Moved existing file to gcc/testsuite/gcc.target/sh/pr57108.c.moved. Conflict adding file gcc/testsuite/gfortran.dg/allocate_error_4.f90. Moved existing file to gcc/testsuite/gfortran.dg/allocate_error_4.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/array_section_3.f90. Moved existing file to gcc/testsuite/gfortran.dg/array_section_3.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/block_12.f90. Moved existing file to gcc/testsuite/gfortran.dg/block_12.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/bound_simplification_3.f90. Moved existing file to gcc/testsuite/gfortran.dg/bound_simplification_3.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/class_55.f90. Moved existing file to gcc/testsuite/gfortran.dg/class_55.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/class_56.f90. Moved existing file to gcc/testsuite/gfortran.dg/class_56.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/class_allocate_13.f90. Moved existing file to gcc/testsuite/gfortran.dg/class_allocate_13.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/coarray_28.f90. Moved existing file to gcc/testsuite/gfortran.dg/coarray_28.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/constructor_7.f90. Moved existing file to gcc/testsuite/gfortran.dg/constructor_7.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/constructor_8.f90. Moved existing file to gcc/testsuite/gfortran.dg/constructor_8.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/do_5.f90. Moved existing file to gcc/testsuite/gfortran.dg/do_5.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/dot_product_2.f90. Moved existing file to gcc/testsuite/gfortran.dg/dot_product_2.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/elemental_scalar_args_2.f90. Moved existing file to gcc/testsuite/gfortran.dg/elemental_scalar_args_2.f90.moved. Text conflict in gcc/testsuite/gfortran.dg/enum_10.f90 Text conflict in gcc/testsuite/gfortran.dg/enum_9.f90 Conflict adding file gcc/testsuite/gfortran.dg/fmt_cache_3.f90. Moved existing file to gcc/testsuite/gfortran.dg/fmt_cache_3.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/function_optimize_11.f90. Moved existing file to gcc/testsuite/gfortran.dg/function_optimize_11.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/function_optimize_12.f90. Moved existing file to gcc/testsuite/gfortran.dg/function_optimize_12.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/gomp/pr56052.f90. Moved existing file to gcc/testsuite/gfortran.dg/gomp/pr56052.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/implicit_pure_3.f90. Moved existing file to gcc/testsuite/gfortran.dg/implicit_pure_3.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/import10.f90. Moved existing file to gcc/testsuite/gfortran.dg/import10.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/import11.f90. Moved existing file to gcc/testsuite/gfortran.dg/import11.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/init_flag_10.f90. Moved existing file to gcc/testsuite/gfortran.dg/init_flag_10.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/inline_sum_4.f90. Moved existing file to gcc/testsuite/gfortran.dg/inline_sum_4.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/internal_pack_13.f90. Moved existing file to gcc/testsuite/gfortran.dg/internal_pack_13.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/internal_pack_14.f90. Moved existing file to gcc/testsuite/gfortran.dg/internal_pack_14.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/intrinsic_8.f90. Moved existing file to gcc/testsuite/gfortran.dg/intrinsic_8.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/intrinsic_size_3.f90. Moved existing file to gcc/testsuite/gfortran.dg/intrinsic_size_3.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/intrinsic_size_4.f90. Moved existing file to gcc/testsuite/gfortran.dg/intrinsic_size_4.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/matmul_9.f90. Moved existing file to gcc/testsuite/gfortran.dg/matmul_9.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/module_error_1.f90. Moved existing file to gcc/testsuite/gfortran.dg/module_error_1.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/namelist_76.f90. Moved existing file to gcc/testsuite/gfortran.dg/namelist_76.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/namelist_77.f90. Moved existing file to gcc/testsuite/gfortran.dg/namelist_77.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/namelist_78.f90. Moved existing file to gcc/testsuite/gfortran.dg/namelist_78.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/namelist_79.f90. Moved existing file to gcc/testsuite/gfortran.dg/namelist_79.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/namelist_80.f90. Moved existing file to gcc/testsuite/gfortran.dg/namelist_80.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/namelist_81.f90. Moved existing file to gcc/testsuite/gfortran.dg/namelist_81.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/pointer_intent_6.f90. Moved existing file to gcc/testsuite/gfortran.dg/pointer_intent_6.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/pr52621.f90. Moved existing file to gcc/testsuite/gfortran.dg/pr52621.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/pr52678.f. Moved existing file to gcc/testsuite/gfortran.dg/pr52678.f.moved. Conflict adding file gcc/testsuite/gfortran.dg/pr52701.f90. Moved existing file to gcc/testsuite/gfortran.dg/pr52701.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/pr52835.f90. Moved existing file to gcc/testsuite/gfortran.dg/pr52835.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/pr56015.f90. Moved existing file to gcc/testsuite/gfortran.dg/pr56015.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/proc_ptr_34.f90. Moved existing file to gcc/testsuite/gfortran.dg/proc_ptr_34.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/proc_ptr_41.f90. Moved existing file to gcc/testsuite/gfortran.dg/proc_ptr_41.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/proc_ptr_comp_37.f90. Moved existing file to gcc/testsuite/gfortran.dg/proc_ptr_comp_37.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90. Moved existing file to gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/save_4.f90. Moved existing file to gcc/testsuite/gfortran.dg/save_4.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/select_8.f90. Moved existing file to gcc/testsuite/gfortran.dg/select_8.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/select_type_29.f03. Moved existing file to gcc/testsuite/gfortran.dg/select_type_29.f03.moved. Conflict adding file gcc/testsuite/gfortran.dg/size_kind_2.f90. Moved existing file to gcc/testsuite/gfortran.dg/size_kind_2.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/size_kind_3.f90. Moved existing file to gcc/testsuite/gfortran.dg/size_kind_3.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/transfer_check_3.f90. Moved existing file to gcc/testsuite/gfortran.dg/transfer_check_3.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/transfer_check_4.f90. Moved existing file to gcc/testsuite/gfortran.dg/transfer_check_4.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/transfer_class_1.f90. Moved existing file to gcc/testsuite/gfortran.dg/transfer_class_1.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/transfer_intrinsic_4.f. Moved existing file to gcc/testsuite/gfortran.dg/transfer_intrinsic_4.f.moved. Conflict adding file gcc/testsuite/gfortran.dg/transfer_intrinsic_5.f90. Moved existing file to gcc/testsuite/gfortran.dg/transfer_intrinsic_5.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/transfer_intrinsic_6.f90. Moved existing file to gcc/testsuite/gfortran.dg/transfer_intrinsic_6.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/typebound_operator_15.f90. Moved existing file to gcc/testsuite/gfortran.dg/typebound_operator_15.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/typebound_override_4.f90. Moved existing file to gcc/testsuite/gfortran.dg/typebound_override_4.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/use_22.f90. Moved existing file to gcc/testsuite/gfortran.dg/use_22.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/use_23.f90. Moved existing file to gcc/testsuite/gfortran.dg/use_23.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/use_24.f90. Moved existing file to gcc/testsuite/gfortran.dg/use_24.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/use_25.f90. Moved existing file to gcc/testsuite/gfortran.dg/use_25.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/use_26.f90. Moved existing file to gcc/testsuite/gfortran.dg/use_26.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/use_27.f90. Moved existing file to gcc/testsuite/gfortran.dg/use_27.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/use_only_6.f90. Moved existing file to gcc/testsuite/gfortran.dg/use_only_6.f90.moved. Conflict adding file gcc/testsuite/gfortran.dg/vect/pr52580.f. Moved existing file to gcc/testsuite/gfortran.dg/vect/pr52580.f.moved. Conflict adding file gcc/testsuite/gfortran.fortran-torture/execute/pr54767.f90. Moved existing file to gcc/testsuite/gfortran.fortran-torture/execute/pr54767.f90.moved. Conflict adding file gcc/testsuite/gnat.dg/aggr20.adb. Moved existing file to gcc/testsuite/gnat.dg/aggr20.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/aggr20.ads. Moved existing file to gcc/testsuite/gnat.dg/aggr20.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/aggr20_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/aggr20_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/alignment10.adb. Moved existing file to gcc/testsuite/gnat.dg/alignment10.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/concat2.adb. Moved existing file to gcc/testsuite/gnat.dg/concat2.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/concat2.ads. Moved existing file to gcc/testsuite/gnat.dg/concat2.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/controlled6.adb. Moved existing file to gcc/testsuite/gnat.dg/controlled6.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/controlled6_pkg-iterators.adb. Moved existing file to gcc/testsuite/gnat.dg/controlled6_pkg-iterators.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/controlled6_pkg-iterators.ads. Moved existing file to gcc/testsuite/gnat.dg/controlled6_pkg-iterators.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/controlled6_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/controlled6_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/controlled7.adb. Moved existing file to gcc/testsuite/gnat.dg/controlled7.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/controlled7.ads. Moved existing file to gcc/testsuite/gnat.dg/controlled7.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/derived_type3.adb. Moved existing file to gcc/testsuite/gnat.dg/derived_type3.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/derived_type3_pkg.adb. Moved existing file to gcc/testsuite/gnat.dg/derived_type3_pkg.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/derived_type3_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/derived_type3_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/discr37.adb. Moved existing file to gcc/testsuite/gnat.dg/discr37.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/discr37.ads. Moved existing file to gcc/testsuite/gnat.dg/discr37.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/discr38.adb. Moved existing file to gcc/testsuite/gnat.dg/discr38.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/in_out_parameter4.adb. Moved existing file to gcc/testsuite/gnat.dg/in_out_parameter4.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/loop_optimization11.adb. Moved existing file to gcc/testsuite/gnat.dg/loop_optimization11.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/loop_optimization11_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/loop_optimization11_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/loop_optimization16.adb. Moved existing file to gcc/testsuite/gnat.dg/loop_optimization16.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/loop_optimization16_pkg.adb. Moved existing file to gcc/testsuite/gnat.dg/loop_optimization16_pkg.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/loop_optimization16_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/loop_optimization16_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/lto11.adb. Moved existing file to gcc/testsuite/gnat.dg/lto11.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/lto11.ads. Moved existing file to gcc/testsuite/gnat.dg/lto11.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/lto13.adb. Moved existing file to gcc/testsuite/gnat.dg/lto13.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/lto13_pkg.adb. Moved existing file to gcc/testsuite/gnat.dg/lto13_pkg.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/lto13_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/lto13_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/lto14.adb. Moved existing file to gcc/testsuite/gnat.dg/lto14.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/lto15.adb. Moved existing file to gcc/testsuite/gnat.dg/lto15.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/lto15.ads. Moved existing file to gcc/testsuite/gnat.dg/lto15.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/modular4.adb. Moved existing file to gcc/testsuite/gnat.dg/modular4.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/modular4_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/modular4_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/null_pointer_deref3.adb. Moved existing file to gcc/testsuite/gnat.dg/null_pointer_deref3.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/opt25.adb. Moved existing file to gcc/testsuite/gnat.dg/opt25.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/opt25_pkg1.adb. Moved existing file to gcc/testsuite/gnat.dg/opt25_pkg1.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/opt25_pkg1.ads. Moved existing file to gcc/testsuite/gnat.dg/opt25_pkg1.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/opt25_pkg2.adb. Moved existing file to gcc/testsuite/gnat.dg/opt25_pkg2.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/opt25_pkg2.ads. Moved existing file to gcc/testsuite/gnat.dg/opt25_pkg2.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/opt26.adb. Moved existing file to gcc/testsuite/gnat.dg/opt26.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/opt28.adb. Moved existing file to gcc/testsuite/gnat.dg/opt28.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/opt28.ads. Moved existing file to gcc/testsuite/gnat.dg/opt28.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/opt28_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/opt28_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/pack16.adb. Moved existing file to gcc/testsuite/gnat.dg/pack16.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/pack16_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/pack16_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/pack17.adb. Moved existing file to gcc/testsuite/gnat.dg/pack17.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/recursive_call.adb. Moved existing file to gcc/testsuite/gnat.dg/recursive_call.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/specs/last_bit.ads. Moved existing file to gcc/testsuite/gnat.dg/specs/last_bit.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/specs/lto12.ads. Moved existing file to gcc/testsuite/gnat.dg/specs/lto12.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/specs/lto12_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/specs/lto12_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/specs/oconst6.ads. Moved existing file to gcc/testsuite/gnat.dg/specs/oconst6.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/specs/pack7.ads. Moved existing file to gcc/testsuite/gnat.dg/specs/pack7.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/specs/pack8.ads. Moved existing file to gcc/testsuite/gnat.dg/specs/pack8.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/specs/pack8_pkg.ads. Moved existing file to gcc/testsuite/gnat.dg/specs/pack8_pkg.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/stack_check3.adb. Moved existing file to gcc/testsuite/gnat.dg/stack_check3.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/stack_check3.ads. Moved existing file to gcc/testsuite/gnat.dg/stack_check3.ads.moved. Conflict adding file gcc/testsuite/gnat.dg/vect8.adb. Moved existing file to gcc/testsuite/gnat.dg/vect8.adb.moved. Conflict adding file gcc/testsuite/gnat.dg/vect8.ads. Moved existing file to gcc/testsuite/gnat.dg/vect8.ads.moved. Text conflict in gcc/testsuite/lib/gcc-dg.exp Text conflict in gcc/testsuite/lib/target-supports.exp Text conflict in gcc/tlink.c Text conflict in gcc/toplev.c Text conflict in gcc/trans-mem.c Text conflict in gcc/tree-data-ref.c Text conflict in gcc/tree-data-ref.h Text conflict in gcc/tree-if-conv.c Text conflict in gcc/tree-inline.c Text conflict in gcc/tree-nested.c Text conflict in gcc/tree-profile.c Text conflict in gcc/tree-sra.c Text conflict in gcc/tree-ssa-alias.c Text conflict in gcc/tree-ssa-alias.h Text conflict in gcc/tree-ssa-ccp.c Text conflict in gcc/tree-ssa-loop-im.c Text conflict in gcc/tree-ssa-loop-niter.c Text conflict in gcc/tree-ssa-math-opts.c Text conflict in gcc/tree-ssa-phiopt.c Text conflict in gcc/tree-ssa-pre.c Text conflict in gcc/tree-ssa-sccvn.c Text conflict in gcc/tree-ssa-strlen.c Text conflict in gcc/tree-ssa-structalias.c Text conflict in gcc/tree-ssa-tail-merge.c Text conflict in gcc/tree-ssa-threadedge.c Text conflict in gcc/tree-switch-conversion.c Text conflict in gcc/tree-tailcall.c Text conflict in gcc/tree-vect-data-refs.c Text conflict in gcc/tree-vect-generic.c Text conflict in gcc/tree-vect-loop-manip.c Text conflict in gcc/tree-vect-loop.c Text conflict in gcc/tree-vect-patterns.c Text conflict in gcc/tree-vect-slp.c Text conflict in gcc/tree-vect-stmts.c Text conflict in gcc/tree-vectorizer.h Text conflict in gcc/tree-vrp.c Text conflict in gcc/var-tracking.c Text conflict in gcc/varasm.c Text conflict in gnattools/ChangeLog Text conflict in include/ChangeLog Text conflict in intl/ChangeLog Text conflict in libada/ChangeLog Text conflict in libcpp/ChangeLog Text conflict in libcpp/configure Text conflict in libcpp/configure.ac Text conflict in libcpp/po/ChangeLog Conflict adding file libcpp/po/eo.po. Moved existing file to libcpp/po/eo.po.moved. Text conflict in libcpp/po/ja.po Conflict adding file libcpp/po/sr.po. Moved existing file to libcpp/po/sr.po.moved. Text conflict in libcpp/po/sv.po Text conflict in libcpp/po/vi.po Text conflict in libdecnumber/ChangeLog Text conflict in libffi/ChangeLog Text conflict in libffi/Makefile.in Text conflict in libffi/configure.ac Text conflict in libffi/include/Makefile.in Text conflict in libffi/man/Makefile.in Text conflict in libffi/testsuite/Makefile.in Text conflict in libgcc/ChangeLog Text conflict in libgcc/Makefile.in Text conflict in libgcc/config.host Conflict adding file libgcc/config/aarch64. Moved existing file to libgcc/config/aarch64.moved. Text conflict in libgcc/config/alpha/linux-unwind.h Text conflict in libgcc/config/avr/lib1funcs.S Conflict adding file libgcc/config/avr/t-avrlibc. Moved existing file to libgcc/config/avr/t-avrlibc.moved. Text conflict in libgcc/config/bfin/linux-unwind.h Text conflict in libgcc/config/i386/32/sfp-machine.h Text conflict in libgcc/config/i386/64/sfp-machine.h Text conflict in libgcc/config/i386/linux-unwind.h Text conflict in libgcc/config/i386/morestack.S Text conflict in libgcc/config/ia64/linux-unwind.h Text conflict in libgcc/config/ia64/unwind-ia64.c Text conflict in libgcc/config/ia64/unwind-ia64.h Text conflict in libgcc/config/libbid/ChangeLog Text conflict in libgcc/config/mips/linux-unwind.h Text conflict in libgcc/config/pa/linux-unwind.h Conflict adding file libgcc/config/rs6000/freebsd-unwind.h. Moved existing file to libgcc/config/rs6000/freebsd-unwind.h.moved. Conflict adding file libgcc/config/rs6000/t-freebsd64. Moved existing file to libgcc/config/rs6000/t-freebsd64.moved. Text conflict in libgcc/config/sh/linux-unwind.h Text conflict in libgcc/config/xtensa/linux-unwind.h Text conflict in libgfortran/ChangeLog Text conflict in libgfortran/intrinsics/eoshift2.c Text conflict in libgfortran/io/format.c Text conflict in libgo/MERGE Text conflict in libgo/Makefile.am Text conflict in libgo/Makefile.in Text conflict in libgo/config.h.in Text conflict in libgo/configure Text conflict in libgo/configure.ac Text conflict in libgo/go/archive/tar/writer.go Text conflict in libgo/go/archive/tar/writer_test.go Text conflict in libgo/go/archive/zip/reader.go Text conflict in libgo/go/archive/zip/reader_test.go Text conflict in libgo/go/archive/zip/struct.go Conflict adding file libgo/go/archive/zip/testdata/crc32-not-streamed.zip. Moved existing file to libgo/go/archive/zip/testdata/crc32-not-streamed.zip.moved. Conflict adding file libgo/go/archive/zip/testdata/go-no-datadesc-sig.zip. Moved existing file to libgo/go/archive/zip/testdata/go-no-datadesc-sig.zip.moved. Conflict adding file libgo/go/archive/zip/testdata/go-with-datadesc-sig.zip. Moved existing file to libgo/go/archive/zip/testdata/go-with-datadesc-sig.zip.moved. Text conflict in libgo/go/archive/zip/writer.go Text conflict in libgo/go/archive/zip/zip_test.go Text conflict in libgo/go/bufio/bufio.go Text conflict in libgo/go/bytes/bytes.go Text conflict in libgo/go/bytes/bytes_test.go Text conflict in libgo/go/bytes/example_test.go Text conflict in libgo/go/bytes/indexbyte.c Conflict adding file libgo/go/bytes/reader.go. Moved existing file to libgo/go/bytes/reader.go.moved. Conflict adding file libgo/go/bytes/reader_test.go. Moved existing file to libgo/go/bytes/reader_test.go.moved. Text conflict in libgo/go/compress/flate/deflate_test.go Conflict adding file libgo/go/compress/flate/reader_test.go. Moved existing file to libgo/go/compress/flate/reader_test.go.moved. Text conflict in libgo/go/compress/gzip/gzip.go Text conflict in libgo/go/compress/gzip/gzip_test.go Text conflict in libgo/go/container/heap/heap.go Text conflict in libgo/go/crypto/aes/cipher.go Text conflict in libgo/go/crypto/md5/md5_test.go Text conflict in libgo/go/crypto/sha1/sha1_test.go Text conflict in libgo/go/crypto/tls/conn.go Text conflict in libgo/go/crypto/tls/handshake_client_test.go Text conflict in libgo/go/crypto/tls/handshake_server.go Text conflict in libgo/go/crypto/tls/handshake_server_test.go Contents conflict in libgo/go/crypto/tls/root_test.go Conflict adding file libgo/go/crypto/x509/root.go. Moved existing file to libgo/go/crypto/x509/root.go.moved. Conflict adding file libgo/go/crypto/x509/root_darwin.go. Moved existing file to libgo/go/crypto/x509/root_darwin.go.moved. Conflict adding file libgo/go/crypto/x509/root_stub.go. Moved existing file to libgo/go/crypto/x509/root_stub.go.moved. Conflict adding file libgo/go/crypto/x509/root_unix.go. Moved existing file to libgo/go/crypto/x509/root_unix.go.moved. Conflict adding file libgo/go/crypto/x509/root_windows.go. Moved existing file to libgo/go/crypto/x509/root_windows.go.moved. Text conflict in libgo/go/crypto/x509/verify.go Text conflict in libgo/go/crypto/x509/verify_test.go Text conflict in libgo/go/crypto/x509/x509.go Text conflict in libgo/go/database/sql/convert.go Text conflict in libgo/go/database/sql/driver/driver.go Text conflict in libgo/go/database/sql/fakedb_test.go Text conflict in libgo/go/database/sql/sql.go Text conflict in libgo/go/database/sql/sql_test.go Text conflict in libgo/go/debug/dwarf/buf.go Text conflict in libgo/go/debug/dwarf/entry.go Conflict adding file libgo/go/debug/dwarf/line.go. Moved existing file to libgo/go/debug/dwarf/line.go.moved. Conflict adding file libgo/go/debug/dwarf/line_test.go. Moved existing file to libgo/go/debug/dwarf/line_test.go.moved. Text conflict in libgo/go/debug/dwarf/type.go Text conflict in libgo/go/debug/dwarf/unit.go Text conflict in libgo/go/debug/gosym/pclntab_test.go Text conflict in libgo/go/encoding/asn1/marshal_test.go Text conflict in libgo/go/encoding/base64/base64.go Text conflict in libgo/go/encoding/base64/base64_test.go Text conflict in libgo/go/encoding/binary/binary.go Text conflict in libgo/go/encoding/binary/binary_test.go Text conflict in libgo/go/encoding/binary/varint.go Text conflict in libgo/go/encoding/gob/codec_test.go Text conflict in libgo/go/encoding/gob/encoder_test.go Text conflict in libgo/go/encoding/json/decode.go Text conflict in libgo/go/encoding/json/decode_test.go Text conflict in libgo/go/encoding/json/encode.go Text conflict in libgo/go/encoding/json/encode_test.go Text conflict in libgo/go/encoding/json/tagkey_test.go Text conflict in libgo/go/encoding/xml/marshal.go Text conflict in libgo/go/encoding/xml/read.go Text conflict in libgo/go/encoding/xml/typeinfo.go Conflict adding files to libgo/go/exp/gotype. Created directory. Conflict because libgo/go/exp/gotype is not versioned, but has versioned children. Versioned directory. Contents conflict in libgo/go/exp/gotype/doc.go Contents conflict in libgo/go/exp/gotype/gotype.go Contents conflict in libgo/go/exp/html/node.go Conflict adding files to libgo/go/exp/inotify. Created directory. Conflict because libgo/go/exp/inotify is not versioned, but has versioned children. Versioned directory. Contents conflict in libgo/go/exp/inotify/inotify_linux_test.go Conflict adding files to libgo/go/exp/norm. Created directory. Conflict because libgo/go/exp/norm is not versioned, but has versioned children. Versioned directory. Contents conflict in libgo/go/exp/norm/composition.go Contents conflict in libgo/go/exp/norm/composition_test.go Contents conflict in libgo/go/exp/norm/forminfo.go Contents conflict in libgo/go/exp/norm/input.go Contents conflict in libgo/go/exp/norm/maketables.go Contents conflict in libgo/go/exp/norm/maketesttables.go Contents conflict in libgo/go/exp/norm/normalize.go Contents conflict in libgo/go/exp/norm/normalize_test.go Contents conflict in libgo/go/exp/norm/normregtest.go Contents conflict in libgo/go/exp/norm/tables.go Contents conflict in libgo/go/exp/norm/triegen.go Conflict adding files to libgo/go/exp/types. Created directory. Conflict because libgo/go/exp/types is not versioned, but has versioned children. Versioned directory. Contents conflict in libgo/go/exp/types/check.go Contents conflict in libgo/go/exp/types/check_test.go Contents conflict in libgo/go/exp/types/exportdata.go Contents conflict in libgo/go/exp/types/gcimporter.go Contents conflict in libgo/go/exp/types/gcimporter_test.go Contents conflict in libgo/go/exp/types/types.go Contents conflict in libgo/go/exp/types/universe.go Conflict adding files to libgo/go/exp/winfsnotify. Created directory. Conflict because libgo/go/exp/winfsnotify is not versioned, but has versioned children. Versioned directory. Contents conflict in libgo/go/exp/winfsnotify/winfsnotify_test.go Conflict adding file libgo/go/flag/example_test.go. Moved existing file to libgo/go/flag/example_test.go.moved. Text conflict in libgo/go/fmt/doc.go Conflict adding file libgo/go/fmt/export_test.go. Moved existing file to libgo/go/fmt/export_test.go.moved. Text conflict in libgo/go/fmt/fmt_test.go Text conflict in libgo/go/fmt/format.go Text conflict in libgo/go/fmt/print.go Text conflict in libgo/go/fmt/scan_test.go Conflict adding file libgo/go/go/ast/ast_test.go. Moved existing file to libgo/go/go/ast/ast_test.go.moved. Text conflict in libgo/go/go/ast/print.go Text conflict in libgo/go/go/build/build.go Text conflict in libgo/go/go/build/build_test.go Conflict adding file libgo/go/go/build/deps_test.go. Moved existing file to libgo/go/go/build/deps_test.go.moved. Conflict adding file libgo/go/go/build/doc.go. Moved existing file to libgo/go/go/build/doc.go.moved. Conflict adding file libgo/go/go/build/testdata. Moved existing file to libgo/go/go/build/testdata.moved. Text conflict in libgo/go/go/doc/example.go Text conflict in libgo/go/go/doc/reader.go Conflict adding file libgo/go/go/doc/synopsis.go. Moved existing file to libgo/go/go/doc/synopsis.go.moved. Conflict adding file libgo/go/go/doc/synopsis_test.go. Moved existing file to libgo/go/go/doc/synopsis_test.go.moved. Text conflict in libgo/go/go/doc/testdata/e.go Conflict adding file libgo/go/go/doc/testdata/error1.0.golden. Moved existing file to libgo/go/go/doc/testdata/error1.0.golden.moved. Conflict adding file libgo/go/go/doc/testdata/error1.1.golden. Moved existing file to libgo/go/go/doc/testdata/error1.1.golden.moved. Conflict adding file libgo/go/go/doc/testdata/error1.2.golden. Moved existing file to libgo/go/go/doc/testdata/error1.2.golden.moved. Conflict adding file libgo/go/go/doc/testdata/error1.go. Moved existing file to libgo/go/go/doc/testdata/error1.go.moved. Conflict adding file libgo/go/go/doc/testdata/error2.0.golden. Moved existing file to libgo/go/go/doc/testdata/error2.0.golden.moved. Conflict adding file libgo/go/go/doc/testdata/error2.1.golden. Moved existing file to libgo/go/go/doc/testdata/error2.1.golden.moved. Conflict adding file libgo/go/go/doc/testdata/error2.2.golden. Moved existing file to libgo/go/go/doc/testdata/error2.2.golden.moved. Conflict adding file libgo/go/go/doc/testdata/error2.go. Moved existing file to libgo/go/go/doc/testdata/error2.go.moved. Conflict adding file libgo/go/go/parser/error_test.go. Moved existing file to libgo/go/go/parser/error_test.go.moved. Text conflict in libgo/go/go/parser/interface.go Text conflict in libgo/go/go/parser/parser.go Text conflict in libgo/go/go/parser/parser_test.go Conflict adding file libgo/go/go/parser/short_test.go. Moved existing file to libgo/go/go/parser/short_test.go.moved. Conflict adding file libgo/go/go/parser/testdata. Moved existing file to libgo/go/go/parser/testdata.moved. Text conflict in libgo/go/go/printer/nodes.go Text conflict in libgo/go/go/printer/performance_test.go Text conflict in libgo/go/go/printer/printer.go Text conflict in libgo/go/go/printer/printer_test.go Text conflict in libgo/go/go/printer/testdata/comments.golden Text conflict in libgo/go/go/printer/testdata/comments.input Text conflict in libgo/go/go/printer/testdata/expressions.golden Text conflict in libgo/go/go/printer/testdata/expressions.input Text conflict in libgo/go/go/printer/testdata/expressions.raw Text conflict in libgo/go/go/scanner/scanner_test.go Text conflict in libgo/go/html/template/content.go Text conflict in libgo/go/html/template/template.go Conflict adding file libgo/go/image/decode_example_test.go. Moved existing file to libgo/go/image/decode_example_test.go.moved. Text conflict in libgo/go/image/jpeg/reader.go Text conflict in libgo/go/image/jpeg/writer.go Text conflict in libgo/go/log/syslog/syslog.go Text conflict in libgo/go/log/syslog/syslog_c.c Text conflict in libgo/go/log/syslog/syslog_test.go Conflict adding file libgo/go/log/syslog/syslog_windows.go. Moved existing file to libgo/go/log/syslog/syslog_windows.go.moved. Text conflict in libgo/go/math/big/nat.go Text conflict in libgo/go/math/gamma.go Text conflict in libgo/go/mime/multipart/multipart.go Text conflict in libgo/go/mime/multipart/multipart_test.go Conflict adding file libgo/go/mime/multipart/testdata. Moved existing file to libgo/go/mime/multipart/testdata.moved. Text conflict in libgo/go/net/dial.go Text conflict in libgo/go/net/dial_test.go Text conflict in libgo/go/net/dialgoogle_test.go Text conflict in libgo/go/net/dnsmsg.go Contents conflict in libgo/go/net/fd.go Contents conflict in libgo/go/net/fd_linux.go Text conflict in libgo/go/net/fd_windows.go Contents conflict in libgo/go/net/file.go Text conflict in libgo/go/net/file_plan9.go Text conflict in libgo/go/net/file_test.go Text conflict in libgo/go/net/http/cgi/host_test.go Text conflict in libgo/go/net/http/client.go Text conflict in libgo/go/net/http/client_test.go Conflict adding file libgo/go/net/http/example_test.go. Moved existing file to libgo/go/net/http/example_test.go.moved. Text conflict in libgo/go/net/http/export_test.go Text conflict in libgo/go/net/http/fs.go Text conflict in libgo/go/net/http/fs_test.go Text conflict in libgo/go/net/http/httptest/server.go Conflict adding file libgo/go/net/http/httptest/server_test.go. Moved existing file to libgo/go/net/http/httptest/server_test.go.moved. Text conflict in libgo/go/net/http/lex.go Text conflict in libgo/go/net/http/pprof/pprof.go Text conflict in libgo/go/net/http/request.go Text conflict in libgo/go/net/http/request_test.go Text conflict in libgo/go/net/http/response.go Text conflict in libgo/go/net/http/serve_test.go Text conflict in libgo/go/net/http/server.go Text conflict in libgo/go/net/http/sniff_test.go Text conflict in libgo/go/net/http/transport.go Text conflict in libgo/go/net/http/transport_test.go Text conflict in libgo/go/net/interface_linux.go Text conflict in libgo/go/net/interface_test.go Text conflict in libgo/go/net/ip_test.go Text conflict in libgo/go/net/ipraw_test.go Text conflict in libgo/go/net/iprawsock.go Text conflict in libgo/go/net/iprawsock_plan9.go Text conflict in libgo/go/net/iprawsock_posix.go Text conflict in libgo/go/net/ipsock_plan9.go Text conflict in libgo/go/net/ipsock_posix.go Text conflict in libgo/go/net/lookup_plan9.go Text conflict in libgo/go/net/lookup_test.go Conflict adding file libgo/go/net/mac.go. Moved existing file to libgo/go/net/mac.go.moved. Conflict adding file libgo/go/net/mac_test.go. Moved existing file to libgo/go/net/mac_test.go.moved. Conflict adding file libgo/go/net/multicast_test.go. Moved existing file to libgo/go/net/multicast_test.go.moved. Text conflict in libgo/go/net/net_test.go Contents conflict in libgo/go/net/newpollserver.go Text conflict in libgo/go/net/parse_test.go Text conflict in libgo/go/net/rpc/server.go Text conflict in libgo/go/net/rpc/server_test.go Text conflict in libgo/go/net/sendfile_linux.go Text conflict in libgo/go/net/sendfile_windows.go Text conflict in libgo/go/net/server_test.go Text conflict in libgo/go/net/smtp/smtp.go Text conflict in libgo/go/net/smtp/smtp_test.go Contents conflict in libgo/go/net/sock.go Text conflict in libgo/go/net/sock_bsd.go Text conflict in libgo/go/net/sock_linux.go Conflict adding file libgo/go/net/sock_solaris.go. Moved existing file to libgo/go/net/sock_solaris.go.moved. Text conflict in libgo/go/net/sock_windows.go Contents conflict in libgo/go/net/sockopt.go Contents conflict in libgo/go/net/sockoptip.go Text conflict in libgo/go/net/sockoptip_bsd.go Contents conflict in libgo/go/net/sockoptip_darwin.go Contents conflict in libgo/go/net/sockoptip_freebsd.go Text conflict in libgo/go/net/sockoptip_linux.go Contents conflict in libgo/go/net/sockoptip_openbsd.go Text conflict in libgo/go/net/sockoptip_windows.go Text conflict in libgo/go/net/tcpsock_plan9.go Text conflict in libgo/go/net/tcpsock_posix.go Conflict adding file libgo/go/net/testdata. Moved existing file to libgo/go/net/testdata.moved. Text conflict in libgo/go/net/textproto/reader.go Text conflict in libgo/go/net/timeout_test.go Text conflict in libgo/go/net/udp_test.go Text conflict in libgo/go/net/udpsock_plan9.go Text conflict in libgo/go/net/udpsock_posix.go Contents conflict in libgo/go/net/unicast_test.go Text conflict in libgo/go/net/unixsock_plan9.go Text conflict in libgo/go/net/unixsock_posix.go Text conflict in libgo/go/net/url/url.go Text conflict in libgo/go/net/url/url_test.go Conflict adding files to libgo/go/old/netchan. Created directory. Conflict because libgo/go/old/netchan is not versioned, but has versioned children. Versioned directory. Contents conflict in libgo/go/old/netchan/netchan_test.go Text conflict in libgo/go/os/dir.go Text conflict in libgo/go/os/dir_plan9.go Text conflict in libgo/go/os/doc.go Text conflict in libgo/go/os/error.go Conflict adding file libgo/go/os/error_test.go. Moved existing file to libgo/go/os/error_test.go.moved. Conflict adding file libgo/go/os/error_windows.go. Moved existing file to libgo/go/os/error_windows.go.moved. Text conflict in libgo/go/os/exec/exec_test.go Text conflict in libgo/go/os/exec/lp_plan9.go Text conflict in libgo/go/os/exec_plan9.go Text conflict in libgo/go/os/exec_posix.go Text conflict in libgo/go/os/file.go Text conflict in libgo/go/os/file_plan9.go Text conflict in libgo/go/os/file_unix.go Text conflict in libgo/go/os/getwd.go Text conflict in libgo/go/os/os_test.go Text conflict in libgo/go/os/path_test.go Conflict adding file libgo/go/os/signal. Moved existing file to libgo/go/os/signal.moved. Text conflict in libgo/go/os/stat_plan9.go Text conflict in libgo/go/path/filepath/path.go Text conflict in libgo/go/path/filepath/path_plan9.go Text conflict in libgo/go/path/filepath/path_test.go Text conflict in libgo/go/path/filepath/path_windows.go Conflict adding file libgo/go/path/filepath/symlink.go. Moved existing file to libgo/go/path/filepath/symlink.go.moved. Conflict adding file libgo/go/path/filepath/symlink_windows.go. Moved existing file to libgo/go/path/filepath/symlink_windows.go.moved. Text conflict in libgo/go/reflect/all_test.go Text conflict in libgo/go/reflect/deepequal.go Text conflict in libgo/go/reflect/type.go Text conflict in libgo/go/reflect/value.go Text conflict in libgo/go/regexp/all_test.go Text conflict in libgo/go/regexp/regexp.go Text conflict in libgo/go/regexp/syntax/parse.go Conflict adding file libgo/go/runtime/compiler.go. Moved existing file to libgo/go/runtime/compiler.go.moved. Text conflict in libgo/go/runtime/debug.go Text conflict in libgo/go/runtime/error.go Text conflict in libgo/go/runtime/extern.go Text conflict in libgo/go/runtime/gc_test.go Conflict adding file libgo/go/runtime/malloc1.go. Moved existing file to libgo/go/runtime/malloc1.go.moved. Conflict adding file libgo/go/runtime/mallocrand.go. Moved existing file to libgo/go/runtime/mallocrand.go.moved. Conflict adding file libgo/go/runtime/mallocrep.go. Moved existing file to libgo/go/runtime/mallocrep.go.moved. Conflict adding file libgo/go/runtime/mallocrep1.go. Moved existing file to libgo/go/runtime/mallocrep1.go.moved. Text conflict in libgo/go/runtime/pprof/pprof.go Text conflict in libgo/go/runtime/pprof/pprof_test.go Conflict adding file libgo/go/runtime/runtime_test.go. Moved existing file to libgo/go/runtime/runtime_test.go.moved. Text conflict in libgo/go/runtime/type.go Conflict adding file libgo/go/sort/example_interface_test.go. Moved existing file to libgo/go/sort/example_interface_test.go.moved. Text conflict in libgo/go/sort/example_test.go Text conflict in libgo/go/sort/sort.go Text conflict in libgo/go/strconv/atof.go Text conflict in libgo/go/strconv/atof_test.go Conflict adding file libgo/go/strconv/isprint.go. Moved existing file to libgo/go/strconv/isprint.go.moved. Text conflict in libgo/go/strconv/itoa_test.go Conflict adding file libgo/go/strconv/makeisprint.go. Moved existing file to libgo/go/strconv/makeisprint.go.moved. Text conflict in libgo/go/strings/example_test.go Text conflict in libgo/go/strings/reader.go Conflict adding file libgo/go/strings/reader_test.go. Moved existing file to libgo/go/strings/reader_test.go.moved. Text conflict in libgo/go/sync/atomic/atomic.c Text conflict in libgo/go/sync/atomic/atomic_test.go Conflict adding file libgo/go/sync/example_test.go. Moved existing file to libgo/go/sync/example_test.go.moved. Conflict adding file libgo/go/sync/export_test.go. Moved existing file to libgo/go/sync/export_test.go.moved. Text conflict in libgo/go/sync/mutex.go Conflict adding file libgo/go/sync/runtime.go. Moved existing file to libgo/go/sync/runtime.go.moved. Conflict adding file libgo/go/sync/runtime_sema_test.go. Moved existing file to libgo/go/sync/runtime_sema_test.go.moved. Text conflict in libgo/go/sync/rwmutex.go Text conflict in libgo/go/sync/waitgroup.go Text conflict in libgo/go/syscall/env_windows.go Text conflict in libgo/go/syscall/errno.c Text conflict in libgo/go/syscall/exec_bsd.go Text conflict in libgo/go/syscall/exec_linux.go Text conflict in libgo/go/syscall/exec_unix.go Text conflict in libgo/go/syscall/exec_windows.go Text conflict in libgo/go/syscall/libcall_linux.go Text conflict in libgo/go/syscall/libcall_posix.go Text conflict in libgo/go/syscall/security_windows.go Conflict adding file libgo/go/syscall/signame.c. Moved existing file to libgo/go/syscall/signame.c.moved. Text conflict in libgo/go/syscall/sockcmsg_unix.go Text conflict in libgo/go/syscall/socket.go Text conflict in libgo/go/syscall/syscall.go Text conflict in libgo/go/syscall/syscall_unix.go Text conflict in libgo/go/syscall/wait.c Text conflict in libgo/go/testing/example.go Text conflict in libgo/go/testing/testing.go Text conflict in libgo/go/text/scanner/scanner.go Conflict adding file libgo/go/text/tabwriter/example_test.go. Moved existing file to libgo/go/text/tabwriter/example_test.go.moved. Text conflict in libgo/go/text/template/exec.go Text conflict in libgo/go/text/template/exec_test.go Text conflict in libgo/go/text/template/funcs.go Text conflict in libgo/go/text/template/parse/lex.go Text conflict in libgo/go/text/template/parse/lex_test.go Text conflict in libgo/go/text/template/parse/node.go Text conflict in libgo/go/text/template/parse/parse.go Text conflict in libgo/go/text/template/parse/parse_test.go Text conflict in libgo/go/time/example_test.go Text conflict in libgo/go/time/format.go Text conflict in libgo/go/time/sleep_test.go Text conflict in libgo/go/time/time_test.go Conflict adding file libgo/go/time/zoneinfo_read.go. Moved existing file to libgo/go/time/zoneinfo_read.go.moved. Text conflict in libgo/go/unicode/letter.go Conflict adding file libgo/go/unicode/utf16/export_test.go. Moved existing file to libgo/go/unicode/utf16/export_test.go.moved. Text conflict in libgo/go/unicode/utf8/utf8.go Text conflict in libgo/merge.sh Text conflict in libgo/runtime/chan.c Text conflict in libgo/runtime/cpuprof.c Text conflict in libgo/runtime/go-append.c Text conflict in libgo/runtime/go-breakpoint.c Text conflict in libgo/runtime/go-caller.c Conflict adding file libgo/runtime/go-callers.c. Moved existing file to libgo/runtime/go-callers.c.moved. Text conflict in libgo/runtime/go-cgo.c Text conflict in libgo/runtime/go-getgoroot.c Text conflict in libgo/runtime/go-nosys.c Text conflict in libgo/runtime/go-now.c Text conflict in libgo/runtime/go-reflect-map.c Text conflict in libgo/runtime/go-rune.c Text conflict in libgo/runtime/go-setenv.c Text conflict in libgo/runtime/go-signal.c Conflict adding file libgo/runtime/go-traceback.c. Moved existing file to libgo/runtime/go-traceback.c.moved. Text conflict in libgo/runtime/go-trampoline.c Text conflict in libgo/runtime/go-type-identity.c Text conflict in libgo/runtime/go-typestring.c Text conflict in libgo/runtime/go-unsafe-new.c Text conflict in libgo/runtime/go-unsafe-newarray.c Text conflict in libgo/runtime/go-unsafe-pointer.c Text conflict in libgo/runtime/goc2c.c Text conflict in libgo/runtime/lock_futex.c Text conflict in libgo/runtime/malloc.goc Text conflict in libgo/runtime/malloc.h Text conflict in libgo/runtime/mem.c Text conflict in libgo/runtime/mgc0.c Text conflict in libgo/runtime/mheap.c Text conflict in libgo/runtime/mprof.goc Conflict adding file libgo/runtime/print.c. Moved existing file to libgo/runtime/print.c.moved. Text conflict in libgo/runtime/proc.c Text conflict in libgo/runtime/runtime.c Text conflict in libgo/runtime/runtime.h Text conflict in libgo/runtime/sema.goc Conflict adding file libgo/runtime/signal_unix.c. Moved existing file to libgo/runtime/signal_unix.c.moved. Text conflict in libgo/runtime/sigqueue.goc Text conflict in libgo/runtime/thread.c Text conflict in libgo/runtime/time.goc Text conflict in libgo/testsuite/gotest Text conflict in libgomp/ChangeLog Text conflict in libgomp/config/linux/lock.c Text conflict in libgomp/team.c Conflict adding file libgomp/testsuite/libgomp.c++/pr56217.C. Moved existing file to libgomp/testsuite/libgomp.c++/pr56217.C.moved. Conflict adding file libgomp/testsuite/libgomp.c/pr52547.c. Moved existing file to libgomp/testsuite/libgomp.c/pr52547.c.moved. Text conflict in libiberty/ChangeLog Text conflict in libiberty/cp-demangle.c Text conflict in libiberty/testsuite/demangle-expected Text conflict in libitm/ChangeLog Text conflict in libitm/config/x86/target.h Text conflict in libitm/configure Text conflict in libjava/ChangeLog Text conflict in libjava/classpath/ChangeLog Text conflict in libjava/classpath/ChangeLog.gcj Text conflict in libjava/classpath/configure.ac Text conflict in libjava/classpath/doc/Makefile.in Contents conflict in libjava/classpath/lib/gnu/gcj/convert/Convert.class Contents conflict in libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Main.class Contents conflict in libjava/classpath/lib/gnu/java/rmi/registry/RegistryImpl.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$10.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$11.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$12.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$13.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$14.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$15.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$16.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$17.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$18.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$19.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$20.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$21.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$22.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$23.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$24.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main$25.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/Main.class Contents conflict in libjava/classpath/tools/classes/gnu/classpath/tools/orbd/Main.class Text conflict in libjava/configure Text conflict in libjava/configure.ac Text conflict in libjava/libltdl/ChangeLog Text conflict in libmudflap/ChangeLog Text conflict in libobjc/ChangeLog Text conflict in libquadmath/ChangeLog Text conflict in libssp/ChangeLog Text conflict in libstdc++-v3/ChangeLog Text conflict in libstdc++-v3/config/abi/post/solaris2.10/amd64/baseline_symbols.txt Text conflict in libstdc++-v3/config/abi/post/solaris2.10/baseline_symbols.txt Text conflict in libstdc++-v3/config/abi/post/solaris2.10/sparcv9/baseline_symbols.txt Conflict adding files to libstdc++-v3/config/abi/post/solaris2.8. Created directory. Conflict because libstdc++-v3/config/abi/post/solaris2.8 is not versioned, but has versioned children. Versioned directory. Contents conflict in libstdc++-v3/config/abi/post/solaris2.8/baseline_symbols.txt Conflict adding files to libstdc++-v3/config/abi/post/solaris2.8/sparcv9. Created directory. Conflict because libstdc++-v3/config/abi/post/solaris2.8/sparcv9 is not versioned, but has versioned children. Versioned directory. Contents conflict in libstdc++-v3/config/abi/post/solaris2.8/sparcv9/baseline_symbols.txt Text conflict in libstdc++-v3/config/locale/gnu/monetary_members.cc Text conflict in libstdc++-v3/config/os/bsd/netbsd/ctype_base.h Text conflict in libstdc++-v3/config/os/gnu-linux/os_defines.h Text conflict in libstdc++-v3/configure Text conflict in libstdc++-v3/configure.ac Text conflict in libstdc++-v3/configure.host Text conflict in libstdc++-v3/doc/Makefile.in Text conflict in libstdc++-v3/doc/html/api.html Text conflict in libstdc++-v3/doc/html/bk02.html Text conflict in libstdc++-v3/doc/html/bk03.html Text conflict in libstdc++-v3/doc/html/faq.html Text conflict in libstdc++-v3/doc/html/index.html Text conflict in libstdc++-v3/doc/html/manual/abi.html Text conflict in libstdc++-v3/doc/html/manual/algorithms.html Text conflict in libstdc++-v3/doc/html/manual/api.html Text conflict in libstdc++-v3/doc/html/manual/appendix_contributing.html Text conflict in libstdc++-v3/doc/html/manual/appendix_free.html Text conflict in libstdc++-v3/doc/html/manual/appendix_gfdl.html Text conflict in libstdc++-v3/doc/html/manual/appendix_gpl.html Text conflict in libstdc++-v3/doc/html/manual/appendix_porting.html Text conflict in libstdc++-v3/doc/html/manual/associative.html Text conflict in libstdc++-v3/doc/html/manual/atomics.html Text conflict in libstdc++-v3/doc/html/manual/backwards.html Text conflict in libstdc++-v3/doc/html/manual/bitmap_allocator.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt02.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt02ch05s02.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch17s02.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch17s03.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch17s04.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch18s02.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch18s03.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch18s04.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch18s05.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch19s02.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch19s03.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch19s04.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch19s05.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch19s06.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch19s07.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch20s02.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch20s03.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch20s04.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch20s05.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch21s02.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch23s02.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch30s02.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03ch30s03.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt03pr01.html Contents conflict in libstdc++-v3/doc/html/manual/bk01pt04.html Text conflict in libstdc++-v3/doc/html/manual/bugs.html Text conflict in libstdc++-v3/doc/html/manual/concurrency.html Text conflict in libstdc++-v3/doc/html/manual/configure.html Text conflict in libstdc++-v3/doc/html/manual/containers.html Text conflict in libstdc++-v3/doc/html/manual/containers_and_c.html Text conflict in libstdc++-v3/doc/html/manual/debug.html Text conflict in libstdc++-v3/doc/html/manual/debug_mode.html Text conflict in libstdc++-v3/doc/html/manual/diagnostics.html Text conflict in libstdc++-v3/doc/html/manual/documentation_hacking.html Text conflict in libstdc++-v3/doc/html/manual/dynamic_memory.html Text conflict in libstdc++-v3/doc/html/manual/ext_algorithms.html Text conflict in libstdc++-v3/doc/html/manual/ext_compile_checks.html Text conflict in libstdc++-v3/doc/html/manual/ext_concurrency.html Text conflict in libstdc++-v3/doc/html/manual/ext_containers.html Text conflict in libstdc++-v3/doc/html/manual/ext_demangling.html Text conflict in libstdc++-v3/doc/html/manual/ext_io.html Text conflict in libstdc++-v3/doc/html/manual/ext_iterators.html Text conflict in libstdc++-v3/doc/html/manual/ext_numerics.html Text conflict in libstdc++-v3/doc/html/manual/ext_utilities.html Text conflict in libstdc++-v3/doc/html/manual/extensions.html Text conflict in libstdc++-v3/doc/html/manual/facets.html Text conflict in libstdc++-v3/doc/html/manual/fstreams.html Text conflict in libstdc++-v3/doc/html/manual/generalized_numeric_operations.html Text conflict in libstdc++-v3/doc/html/manual/index.html Text conflict in libstdc++-v3/doc/html/manual/internals.html Text conflict in libstdc++-v3/doc/html/manual/intro.html Text conflict in libstdc++-v3/doc/html/manual/io.html Text conflict in libstdc++-v3/doc/html/manual/io_and_c.html Text conflict in libstdc++-v3/doc/html/manual/iterators.html Text conflict in libstdc++-v3/doc/html/manual/license.html Text conflict in libstdc++-v3/doc/html/manual/localization.html Text conflict in libstdc++-v3/doc/html/manual/make.html Text conflict in libstdc++-v3/doc/html/manual/memory.html Text conflict in libstdc++-v3/doc/html/manual/mt_allocator.html Text conflict in libstdc++-v3/doc/html/manual/numerics.html Text conflict in libstdc++-v3/doc/html/manual/numerics_and_c.html Text conflict in libstdc++-v3/doc/html/manual/pairs.html Text conflict in libstdc++-v3/doc/html/manual/parallel_mode.html Text conflict in libstdc++-v3/doc/html/manual/policy_based_data_structures_test.html Text conflict in libstdc++-v3/doc/html/manual/policy_data_structures.html Conflict adding file libstdc++-v3/doc/html/manual/policy_data_structures_ack.html. Moved existing file to libstdc++-v3/doc/html/manual/policy_data_structures_ack.html.moved. Text conflict in libstdc++-v3/doc/html/manual/policy_data_structures_design.html Text conflict in libstdc++-v3/doc/html/manual/policy_data_structures_using.html Text conflict in libstdc++-v3/doc/html/manual/profile_mode.html Text conflict in libstdc++-v3/doc/html/manual/setup.html Text conflict in libstdc++-v3/doc/html/manual/source_code_style.html Text conflict in libstdc++-v3/doc/html/manual/source_design_notes.html Text conflict in libstdc++-v3/doc/html/manual/source_organization.html Text conflict in libstdc++-v3/doc/html/manual/status.html Text conflict in libstdc++-v3/doc/html/manual/streambufs.html Text conflict in libstdc++-v3/doc/html/manual/strings.html Text conflict in libstdc++-v3/doc/html/manual/stringstreams.html Text conflict in libstdc++-v3/doc/html/manual/support.html Text conflict in libstdc++-v3/doc/html/manual/termination.html Text conflict in libstdc++-v3/doc/html/manual/test.html Text conflict in libstdc++-v3/doc/html/manual/traits.html Text conflict in libstdc++-v3/doc/html/manual/using.html Text conflict in libstdc++-v3/doc/html/manual/using_concurrency.html Text conflict in libstdc++-v3/doc/html/manual/using_dynamic_or_shared.html Text conflict in libstdc++-v3/doc/html/manual/using_exceptions.html Text conflict in libstdc++-v3/doc/html/manual/using_headers.html Text conflict in libstdc++-v3/doc/html/manual/using_macros.html Text conflict in libstdc++-v3/doc/html/manual/using_namespaces.html Text conflict in libstdc++-v3/doc/html/manual/utilities.html Text conflict in libstdc++-v3/doc/xml/manual/abi.xml Text conflict in libstdc++-v3/doc/xml/manual/build_hacking.xml Text conflict in libstdc++-v3/doc/xml/manual/policy_data_structures.xml Conflict adding file libstdc++-v3/doc/xml/manual/policy_data_structures_biblio.xml. Moved existing file to libstdc++-v3/doc/xml/manual/policy_data_structures_biblio.xml.moved. Conflict adding file libstdc++-v3/doc/xsl. Moved existing file to libstdc++-v3/doc/xsl.moved. Text conflict in libstdc++-v3/include/Makefile.am Text conflict in libstdc++-v3/include/bits/alloc_traits.h Text conflict in libstdc++-v3/include/bits/deque.tcc Text conflict in libstdc++-v3/include/bits/forward_list.h Text conflict in libstdc++-v3/include/bits/hashtable.h Text conflict in libstdc++-v3/include/bits/hashtable_policy.h Text conflict in libstdc++-v3/include/bits/list.tcc Text conflict in libstdc++-v3/include/bits/ptr_traits.h Text conflict in libstdc++-v3/include/bits/random.h Text conflict in libstdc++-v3/include/bits/random.tcc Text conflict in libstdc++-v3/include/bits/shared_ptr_base.h Text conflict in libstdc++-v3/include/bits/stl_algobase.h Text conflict in libstdc++-v3/include/bits/stl_function.h Text conflict in libstdc++-v3/include/bits/stl_list.h Text conflict in libstdc++-v3/include/bits/stl_map.h Text conflict in libstdc++-v3/include/bits/stl_multimap.h Text conflict in libstdc++-v3/include/bits/stl_pair.h Text conflict in libstdc++-v3/include/bits/stl_vector.h Text conflict in libstdc++-v3/include/bits/unordered_map.h Text conflict in libstdc++-v3/include/bits/unordered_set.h Text conflict in libstdc++-v3/include/c_global/cstdio Text conflict in libstdc++-v3/include/c_std/cstdio Text conflict in libstdc++-v3/include/debug/safe_iterator.h Text conflict in libstdc++-v3/include/debug/safe_iterator.tcc Text conflict in libstdc++-v3/include/debug/unordered_map Text conflict in libstdc++-v3/include/debug/unordered_set Text conflict in libstdc++-v3/include/ext/alloc_traits.h Text conflict in libstdc++-v3/include/ext/concurrence.h Text conflict in libstdc++-v3/include/ext/functional Text conflict in libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp Text conflict in libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp Text conflict in libstdc++-v3/include/ext/pointer.h Text conflict in libstdc++-v3/include/ext/rope Text conflict in libstdc++-v3/include/ext/string_conversions.h Text conflict in libstdc++-v3/include/profile/map.h Text conflict in libstdc++-v3/include/profile/multimap.h Text conflict in libstdc++-v3/include/profile/unordered_map Text conflict in libstdc++-v3/include/std/array Text conflict in libstdc++-v3/include/std/condition_variable Text conflict in libstdc++-v3/include/std/functional Text conflict in libstdc++-v3/include/std/future Text conflict in libstdc++-v3/include/std/mutex Text conflict in libstdc++-v3/include/std/scoped_allocator Text conflict in libstdc++-v3/include/std/streambuf Text conflict in libstdc++-v3/include/std/thread Text conflict in libstdc++-v3/include/std/unordered_map Text conflict in libstdc++-v3/include/std/unordered_set Text conflict in libstdc++-v3/include/tr1/functional Text conflict in libstdc++-v3/include/tr2/type_traits Text conflict in libstdc++-v3/libsupc++/Makefile.am Text conflict in libstdc++-v3/libsupc++/Makefile.in Text conflict in libstdc++-v3/libsupc++/initializer_list Text conflict in libstdc++-v3/src/Makefile.am Text conflict in libstdc++-v3/src/Makefile.in Text conflict in libstdc++-v3/src/c++11/Makefile.am Text conflict in libstdc++-v3/src/c++11/Makefile.in Text conflict in libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc Text conflict in libstdc++-v3/src/c++11/compatibility-c++0x.cc Conflict adding file libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc. Moved existing file to libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc.moved. Text conflict in libstdc++-v3/src/c++11/condition_variable.cc Text conflict in libstdc++-v3/src/c++11/mutex.cc Text conflict in libstdc++-v3/src/c++11/thread.cc Text conflict in libstdc++-v3/src/c++98/Makefile.am Text conflict in libstdc++-v3/src/c++98/Makefile.in Text conflict in libstdc++-v3/src/c++98/compatibility-ldbl.cc Contents conflict in libstdc++-v3/src/c++98/compatibility-list-2.cc Contents conflict in libstdc++-v3/src/c++98/compatibility-list.cc Conflict adding file libstdc++-v3/testsuite/17_intro/shared_with_static_deps.cc. Moved existing file to libstdc++-v3/testsuite/17_intro/shared_with_static_deps.cc.moved. Text conflict in libstdc++-v3/testsuite/20_util/bind/ref_neg.cc Conflict adding file libstdc++-v3/testsuite/20_util/function/cons/55320.cc. Moved existing file to libstdc++-v3/testsuite/20_util/function/cons/55320.cc.moved. Conflict adding file libstdc++-v3/testsuite/20_util/function/cons/addressof.cc. Moved existing file to libstdc++-v3/testsuite/20_util/function/cons/addressof.cc.moved. Conflict adding file libstdc++-v3/testsuite/20_util/function_objects/mem_fn. Moved existing file to libstdc++-v3/testsuite/20_util/function_objects/mem_fn.moved. Text conflict in libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc Text conflict in libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc Text conflict in libstdc++-v3/testsuite/20_util/scoped_allocator/1.cc Text conflict in libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc Conflict adding file libstdc++-v3/testsuite/20_util/shared_ptr/cons/52924.cc. Moved existing file to libstdc++-v3/testsuite/20_util/shared_ptr/cons/52924.cc.moved. Conflict adding file libstdc++-v3/testsuite/20_util/shared_ptr/cons/55123.cc. Moved existing file to libstdc++-v3/testsuite/20_util/shared_ptr/cons/55123.cc.moved. Conflict adding file libstdc++-v3/testsuite/20_util/unique_ptr/54351.cc. Moved existing file to libstdc++-v3/testsuite/20_util/unique_ptr/54351.cc.moved. Text conflict in libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc Conflict adding file libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc. Moved existing file to libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/array/element_access/54388.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/array/element_access/54388.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace. Moved existing file to libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace.moved. Text conflict in libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc Conflict adding file libstdc++-v3/testsuite/23_containers/forward_list/modifiers/6.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/forward_list/modifiers/6.cc.moved. Text conflict in libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc Text conflict in libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/assign_neg.cc Text conflict in libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_1_neg.cc Text conflict in libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_2_neg.cc Text conflict in libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/insert_neg.cc Conflict adding file libstdc++-v3/testsuite/23_containers/list/modifiers/emplace. Moved existing file to libstdc++-v3/testsuite/23_containers/list/modifiers/emplace.moved. Text conflict in libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc Text conflict in libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc Text conflict in libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc Text conflict in libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_map/55043.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_map/55043.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/reserve.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/reserve.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_map/requirements/52942.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_map/requirements/52942.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53067.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53067.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53339.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_map/requirements/53339.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multimap/55043.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multimap/55043.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/52476.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/52476.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/53115.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/53115.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/55028-debug.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/55028-debug.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/reserve.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/reserve.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/53339.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/53339.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multiset/55043.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multiset/55043.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/52476.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/52476.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/53115.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/53115.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/reserve.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/reserve.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_set/55043.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_set/55043.cc.moved. Text conflict in libstdc++-v3/testsuite/23_containers/unordered_set/instantiation_neg.cc Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/reserve.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/reserve.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_set/requirements/52942.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_set/requirements/52942.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/unordered_set/requirements/53067.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/unordered_set/requirements/53067.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/vector/52591.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/vector/52591.cc.moved. Text conflict in libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc Conflict adding file libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc. Moved existing file to libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc.moved. Conflict adding file libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace. Moved existing file to libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace.moved. Text conflict in libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc Text conflict in libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc Text conflict in libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc Text conflict in libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc Text conflict in libstdc++-v3/testsuite/25_algorithms/stable_partition/mem_check.cc Conflict adding file libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc. Moved existing file to libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc.moved. Text conflict in libstdc++-v3/testsuite/25_algorithms/stable_sort/mem_check.cc Conflict adding file libstdc++-v3/testsuite/26_numerics/headers/cmath/53503.cc. Moved existing file to libstdc++-v3/testsuite/26_numerics/headers/cmath/53503.cc.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/binomial_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/binomial_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/cauchy_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/cauchy_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/chi_squared_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/chi_squared_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/discard_block_engine/cons/55215.cc. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/discard_block_engine/cons/55215.cc.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/discrete_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/discrete_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/exponential_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/exponential_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/extreme_value_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/extreme_value_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/fisher_f_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/fisher_f_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/gamma_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/gamma_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/geometric_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/geometric_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/55215.cc. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/55215.cc.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/cons/55215.cc. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/cons/55215.cc.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/lognormal_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/lognormal_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/mersenne_twister_engine/cons/55215.cc. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/mersenne_twister_engine/cons/55215.cc.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/negative_binomial_distribution/operators/58302.cc. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/negative_binomial_distribution/operators/58302.cc.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/negative_binomial_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/negative_binomial_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/normal_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/normal_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/poisson_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/poisson_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/55215.cc. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/55215.cc.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/student_t_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/student_t_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/subtract_with_carry_engine/cons/55215.cc. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/subtract_with_carry_engine/cons/55215.cc.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/uniform_int_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/uniform_int_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/uniform_real_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/uniform_real_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/26_numerics/random/weibull_distribution/requirements/explicit_instantiation. Moved existing file to libstdc++-v3/testsuite/26_numerics/random/weibull_distribution/requirements/explicit_instantiation.moved. Conflict adding file libstdc++-v3/testsuite/29_atomics/atomic/operators/56011.cc. Moved existing file to libstdc++-v3/testsuite/29_atomics/atomic/operators/56011.cc.moved. Conflict adding file libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/56012.cc. Moved existing file to libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/56012.cc.moved. Conflict adding file libstdc++-v3/testsuite/30_threads/async/54297.cc. Moved existing file to libstdc++-v3/testsuite/30_threads/async/54297.cc.moved. Conflict adding file libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc. Moved existing file to libstdc++-v3/testsuite/30_threads/condition_variable/54185.cc.moved. Conflict adding file libstdc++-v3/testsuite/30_threads/condition_variable/members/53841.cc. Moved existing file to libstdc++-v3/testsuite/30_threads/condition_variable/members/53841.cc.moved. Conflict adding file libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc. Moved existing file to libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc.moved. Text conflict in libstdc++-v3/testsuite/30_threads/lock_guard/cons/1.cc Conflict adding file libstdc++-v3/testsuite/30_threads/thread/adl.cc. Moved existing file to libstdc++-v3/testsuite/30_threads/thread/adl.cc.moved. Conflict adding file libstdc++-v3/testsuite/30_threads/thread/native_handle/cancel.cc. Moved existing file to libstdc++-v3/testsuite/30_threads/thread/native_handle/cancel.cc.moved. Text conflict in libstdc++-v3/testsuite/Makefile.am Conflict adding file libstdc++-v3/testsuite/decimal/pr54036-1.cc. Moved existing file to libstdc++-v3/testsuite/decimal/pr54036-1.cc.moved. Conflict adding file libstdc++-v3/testsuite/decimal/pr54036-2.cc. Moved existing file to libstdc++-v3/testsuite/decimal/pr54036-2.cc.moved. Conflict adding file libstdc++-v3/testsuite/decimal/pr54036-3.cc. Moved existing file to libstdc++-v3/testsuite/decimal/pr54036-3.cc.moved. Conflict adding file libstdc++-v3/testsuite/performance/23_containers/insert/unordered_set.cc. Moved existing file to libstdc++-v3/testsuite/performance/23_containers/insert/unordered_set.cc.moved. Conflict adding file libstdc++-v3/testsuite/performance/25_algorithms/sort.cc. Moved existing file to libstdc++-v3/testsuite/performance/25_algorithms/sort.cc.moved. Conflict adding file libstdc++-v3/testsuite/performance/25_algorithms/sort_heap.cc. Moved existing file to libstdc++-v3/testsuite/performance/25_algorithms/sort_heap.cc.moved. Conflict adding file libstdc++-v3/testsuite/performance/25_algorithms/stable_sort.cc. Moved existing file to libstdc++-v3/testsuite/performance/25_algorithms/stable_sort.cc.moved. Text conflict in libstdc++-v3/testsuite/performance/30_threads/future/polling.cc Conflict adding file libstdc++-v3/testsuite/tr1/3_function_objects/function/10.cc. Moved existing file to libstdc++-v3/testsuite/tr1/3_function_objects/function/10.cc.moved. Text conflict in lto-plugin/ChangeLog Text conflict in maintainer-scripts/ChangeLog Text conflict in zlib/ChangeLog |
||||
To merge this branch: | bzr merge lp:gcc-linaro/4.7 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Linaro Toolchain Developers | Pending | ||
Review via email: mp+194716@code.launchpad.net |
Description of the change
gcc-linaro-4.7 2013.11 branch merge up to revision 204656.
Unmerged revisions
- 115108. By Christophe Lyon
-
Bump version number, post release.
- 115107. By Christophe Lyon
-
Make 4.7-2014.06 release.
- 115106. By Christophe Lyon
-
Merge from FSF GCC 4.7.4 (svn branches/
gcc-4_7- branch 211571). - 115105. By Yvan Roux
-
Bump version number, post release.
- 115104. By Yvan Roux
-
Make 4.7-2014.04 release.
- 115103. By Yvan Roux
-
Fix lp 1301335
2014-04-07 Kugan Vivekanandarajah <email address hidden>
gcc/
* tree-vect-patterns. c (vect_recog_ sdivmod_ pow2_pattern) : Pass
bb_vinfo to new_stmt_vec_info. - 115102. By Yvan Roux
-
2014-04-07 Michael Collison <email address hidden>
Backport from mainline r202663
2013-09-17 Cong Hou <email address hidden>gcc/
* tree-vect-patterns. c (vect_recog_ dot_prod_ pattern) : Fix a bug
when checking the dot production pattern. The type of rhs operand
of multiply is now checked correctly.gcc/testsuite/
* gcc.dg/vect/vect- reduc-dot- s16c.c: Add a test case with dot product
on two arrays with short and int types. This should not be recognized
as a dot product pattern. - 115101. By Yvan Roux
-
Fix lp1129013
2014-04-07 Yvan Roux <email address hidden>
Backport from trunk 199551.
2013-05-31 Marcus Shawcroft <email address hidden>gcc/testsuite/
* gcc.target/arm/pr56184. C: Add -fno-short-enums. Backport from trunk 196019.
2013-02-13 Vladimir Makarov <email address hidden>gcc/
PR target/56184
* ira.c (max_regno_before_ ira): Move from ...
(ira): ... here.
(fix_reg_ equiv_init) : Use max_regno_ before_ ira instead of
vec_safe_ length. gcc/testsuite/
PR target/56184
* gcc.target/arm/pr56184. C: New test. - 115100. By Yvan Roux
-
Merge from FSF GCC 4.7.4 (svn branches/
gcc-4_7- branch 209005). - 115099. By Christophe Lyon
-
Bump version number, post release.