    left [924a0db817ca42d1771f7d98ccafb4ecd512ebb1]
   right [e4fb127d34f082c0ce368153fbc3ccbb89baad74]
ancestor [cfe9cc3b0f4798557a417f559a4f43c3d525e0b6]

           conflict duplicate_name
          left_type "added file"
          left_name "debian/patches/gcc-default-ssp-ppc64.diff"
       left_file_id [a15bfb5392c04e90f8de0eacfd94c7672bf4cfb5]
         right_type "added file"
         right_name "debian/patches/gcc-default-ssp-ppc64.diff"
      right_file_id [0041f26fb0e0a6da20aaaac99f7406f129582bf9]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/patches/gcc-ppc64-O3.diff"
       left_file_id [0954fed624bee0265c9136395265a922b9570aef]
         right_type "added file"
         right_name "debian/patches/gcc-ppc64-O3.diff"
      right_file_id [0954fed624bee0265c9136395265a922b9570aef]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/patches/no_fpr_in_libgcc.diff"
       left_file_id [dce307655024aa4b0723d9d6891099c74a074985]
         right_type "added file"
         right_name "debian/patches/no_fpr_in_libgcc.diff"
      right_file_id [287d553716d797a474935ba5a9f2280d855bee03]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/patches/powerpc_remove_many.diff"
       left_file_id [3837dfd70560bd48f39837ed33a200744163aa3c]
         right_type "added file"
         right_name "debian/patches/powerpc_remove_many.diff"
      right_file_id [ccda53b04c040603363cf970c2628f368dc6ef9d]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/patches/gcc-powerpc-undef.diff"
       left_file_id [ae13905d53f91bbdb99f438645481f5ba8df6468]
         right_type "added file"
         right_name "debian/patches/gcc-powerpc-undef.diff"
      right_file_id [ae13905d53f91bbdb99f438645481f5ba8df6468]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libgcc1.symbols.kfreebsd-i386"
       left_file_id [4dd58a86325bd67312cacb7841b160381dd59db0]
         right_type "added file"
         right_name "debian/libgcc1.symbols.kfreebsd-i386"
      right_file_id [4dd58a86325bd67312cacb7841b160381dd59db0]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libgfortran3.symbols.kfreebsd-i386"
       left_file_id [9b2e6d76c392e5ba28efa567b2197b88b86a499b]
         right_type "added file"
         right_name "debian/libgfortran3.symbols.kfreebsd-i386"
      right_file_id [9b2e6d76c392e5ba28efa567b2197b88b86a499b]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libstdc++6.symbols.kfreebsd-i386"
       left_file_id [22fe9604f0649cad8a28f0f28e829783592e3456]
         right_type "added file"
         right_name "debian/libstdc++6.symbols.kfreebsd-i386"
      right_file_id [22fe9604f0649cad8a28f0f28e829783592e3456]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/lib32gcc1.symbols.kfreebsd-amd64"
       left_file_id [57c6f9e94a4880db69c905f7c2cbd07051813009]
         right_type "added file"
         right_name "debian/lib32gcc1.symbols.kfreebsd-amd64"
      right_file_id [57c6f9e94a4880db69c905f7c2cbd07051813009]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/lib32stdc++6.symbols.kfreebsd-amd64"
       left_file_id [eb2b8e1a7880b5581d706ddeae06ab824d8d5024]
         right_type "added file"
         right_name "debian/lib32stdc++6.symbols.kfreebsd-amd64"
      right_file_id [eb2b8e1a7880b5581d706ddeae06ab824d8d5024]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libgcc1.symbols.kfreebsd-amd64"
       left_file_id [a61cced1218c260f386cd9c7fffa4a0f86b4ce2b]
         right_type "added file"
         right_name "debian/libgcc1.symbols.kfreebsd-amd64"
      right_file_id [a61cced1218c260f386cd9c7fffa4a0f86b4ce2b]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libgfortran3.symbols.kfreebsd-amd64"
       left_file_id [77d55f11b8e89ecde6240583169b009a3601670d]
         right_type "added file"
         right_name "debian/libgfortran3.symbols.kfreebsd-amd64"
      right_file_id [77d55f11b8e89ecde6240583169b009a3601670d]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libstdc++6.symbols.kfreebsd-amd64"
       left_file_id [022b35614b5b7a0289ec6b76227e2ce63621ccc2]
         right_type "added file"
         right_name "debian/libstdc++6.symbols.kfreebsd-amd64"
      right_file_id [022b35614b5b7a0289ec6b76227e2ce63621ccc2]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libgcc1.symbols.sparc64"
       left_file_id [67c22b25246a470c994f1e35afb0734bcb8cf0f0]
         right_type "added file"
         right_name "debian/libgcc1.symbols.sparc64"
      right_file_id [67c22b25246a470c994f1e35afb0734bcb8cf0f0]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libgfortran3.symbols.sparc64"
       left_file_id [df394120c81ac0dd70f0298b8ac957339df32bf3]
         right_type "added file"
         right_name "debian/libgfortran3.symbols.sparc64"
      right_file_id [df394120c81ac0dd70f0298b8ac957339df32bf3]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libstdc++6.symbols.sparc64"
       left_file_id [587c7e4a51480a68ae2fded7686ed9ef4de7713d]
         right_type "added file"
         right_name "debian/libstdc++6.symbols.sparc64"
      right_file_id [587c7e4a51480a68ae2fded7686ed9ef4de7713d]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libgcc1.symbols.sh4"
       left_file_id [49b37e59f2158c6e61df98bb30449bfbaafed28a]
         right_type "added file"
         right_name "debian/libgcc1.symbols.sh4"
      right_file_id [49b37e59f2158c6e61df98bb30449bfbaafed28a]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libgfortran3.symbols.sh4"
       left_file_id [8d01d36b2a6fae76fa1271ba0e085c54e23e8a3a]
         right_type "added file"
         right_name "debian/libgfortran3.symbols.sh4"
      right_file_id [8d01d36b2a6fae76fa1271ba0e085c54e23e8a3a]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/libstdc++6.symbols.sh4"
       left_file_id [d012780b6a85b964940f4505c0e931c2da236861]
         right_type "added file"
         right_name "debian/libstdc++6.symbols.sh4"
      right_file_id [d012780b6a85b964940f4505c0e931c2da236861]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/patches/armhf-triplet-backport.diff"
       left_file_id [95151c7ec11021aecce62a70cab98ee9615566b6]
         right_type "added file"
         right_name "debian/patches/armhf-triplet-backport.diff"
      right_file_id [3ffab9d2ae102f83afc1135f8de2eeebe3934d51]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/patches/gcc-multiarch+biarch.diff"
       left_file_id [6d7434626ea6e4b0025043bec020db6fc2bb26a7]
         right_type "added file"
         right_name "debian/patches/gcc-multiarch+biarch.diff"
      right_file_id [6d7434626ea6e4b0025043bec020db6fc2bb26a7]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/patches/gcc-multiarch+biarch32.diff"
       left_file_id [99565308f5254329033a1b711afadc507757bac1]
         right_type "added file"
         right_name "debian/patches/gcc-multiarch+biarch32.diff"
      right_file_id [99565308f5254329033a1b711afadc507757bac1]
 resolved_keep_left 
resolved_drop_right 

           conflict duplicate_name
          left_type "added file"
          left_name "debian/patches/pr48226.diff"
       left_file_id [2d7d7b307da8264d0af99f898fac62700db2db20]
         right_type "added file"
         right_name "debian/patches/pr48226.diff"
      right_file_id [2d7d7b307da8264d0af99f898fac62700db2db20]
 resolved_keep_left 
resolved_drop_right 

          conflict content
         node_type "file"
     ancestor_name "debian/changelog"
  ancestor_file_id [abce5e0ec5a6df99a3c075ef7928442a953901fd]
         left_name "debian/changelog"
      left_file_id [c9fd4ba022e528fd06903ae783bc80d967880eeb]
        right_name "debian/changelog"
     right_file_id [dec0ea76b6168044e8713c5394524832fbda986d]
resolved_user_left "_MTN/debian/changelog"

          conflict content
         node_type "file"
     ancestor_name "debian/control"
  ancestor_file_id [274987def2f1e9314508d6a73c7d97ec7a4d7150]
         left_name "debian/control"
      left_file_id [7a262b564e6d886ab8aa965eeaddf18b753d0fed]
        right_name "debian/control"
     right_file_id [cb8d9dab1ad149934e5b6d6150d441a81cd7f2d1]
resolved_user_left "_MTN/debian/control"

         conflict content
        node_type "file"
    ancestor_name "debian/copyright.in"
 ancestor_file_id [52a881be81ede5871c8616dfd212e900f961810f]
        left_name "debian/copyright.in"
     left_file_id [8972cdfdfc53592f306cc2fbcb1630107381e850]
       right_name "debian/copyright.in"
    right_file_id [52a881be81ede5871c8616dfd212e900f961810f]
resolved_internal 

         conflict content
        node_type "file"
    ancestor_name "debian/patches/libstdc++-pic.diff"
 ancestor_file_id [bb67c0f9c2af8398c1c1045bad082e0bf40642b5]
        left_name "debian/patches/libstdc++-pic.diff"
     left_file_id [7ed454744cca1fe9c581b0047d2418c2ecca62e8]
       right_name "debian/patches/libstdc++-pic.diff"
    right_file_id [bb67c0f9c2af8398c1c1045bad082e0bf40642b5]
resolved_internal 

         conflict content
        node_type "file"
    ancestor_name "debian/rules.conf"
 ancestor_file_id [b49659dbb347b30b70ccd92450baf40b6e267e9f]
        left_name "debian/rules.conf"
     left_file_id [f5485bfcb49275b7dd964e08ebb17193789d86e5]
       right_name "debian/rules.conf"
    right_file_id [473976cf8eaf09f88e1aaddc0c4989a9e6433602]
resolved_internal 

         conflict content
        node_type "file"
    ancestor_name "debian/rules.d/binary-base.mk"
 ancestor_file_id [380c745b5c7b7b01b6b014d0784df8d6e5c7e912]
        left_name "debian/rules.d/binary-base.mk"
     left_file_id [afbcb178e65f7e8e9b69dc093a6065ef7a60d95f]
       right_name "debian/rules.d/binary-base.mk"
    right_file_id [f2c6e63eed80b9d87311933fc15a360f0989c089]
resolved_internal 

          conflict content
         node_type "file"
     ancestor_name "debian/rules.d/binary-fortran.mk"
  ancestor_file_id [a813bb45d427370acd6bd74901dc8eebd8a99259]
         left_name "debian/rules.d/binary-fortran.mk"
      left_file_id [474b8a109da7f3570e092f6ab19dbb5ae84263cd]
        right_name "debian/rules.d/binary-fortran.mk"
     right_file_id [6e9df33bd1b39b014e85f966eb1e0c07b5a8d26f]
resolved_user_left "_MTN/debian/rules.d/binary-fortran.mk"

          conflict content
         node_type "file"
     ancestor_name "debian/rules.d/binary-gcc.mk"
  ancestor_file_id [fb4ba235d5368ae1e7f79e87f4474166e43db986]
         left_name "debian/rules.d/binary-gcc.mk"
      left_file_id [c9c519792a5468f3a2552a6976f6b5cbfedf538c]
        right_name "debian/rules.d/binary-gcc.mk"
     right_file_id [45eb9a96a1e3aad07a783977aa433271679d0394]
resolved_user_left "_MTN/debian/rules.d/binary-gcc.mk"

         conflict content
        node_type "file"
    ancestor_name "debian/rules.d/binary-java.mk"
 ancestor_file_id [0bf4217450a9aaa113d73acee495677f5a16d9d3]
        left_name "debian/rules.d/binary-java.mk"
     left_file_id [bc9ae2be91c9f9ac32a3fc29464195803a14282b]
       right_name "debian/rules.d/binary-java.mk"
    right_file_id [9395663aa70f20e0249642fedf4ba867f1ed1ceb]
resolved_internal 

         conflict content
        node_type "file"
    ancestor_name "debian/rules.d/binary-libstdcxx.mk"
 ancestor_file_id [017432cf69fcc40420413fe8688a2d9f31ebbf95]
        left_name "debian/rules.d/binary-libstdcxx.mk"
     left_file_id [8d748e373ae35c00493bfb13e76756803d71bf6c]
       right_name "debian/rules.d/binary-libstdcxx.mk"
    right_file_id [dc4b3f3592f3f5d5ad1c7e99a148f0312d69f22b]
resolved_internal 

         conflict content
        node_type "file"
    ancestor_name "debian/rules.defs"
 ancestor_file_id [82a2fb39f55c477f5049d20412d4b6072ed5bd48]
        left_name "debian/rules.defs"
     left_file_id [2a3f5609b869f205a28beff9ecca431624db4453]
       right_name "debian/rules.defs"
    right_file_id [a8f543f58d0232579061ae9a479d0d58e8c94cef]
resolved_internal 

          conflict content
         node_type "file"
     ancestor_name "debian/rules.patch"
  ancestor_file_id [c11ebdee0ce146025b4ea8eb161947c5c09fe252]
         left_name "debian/rules.patch"
      left_file_id [7c4bf2df0f3db02ae1a03c00fd0787b7abb836ca]
        right_name "debian/rules.patch"
     right_file_id [4d5980f51d4c52fa79d50fc9ded5782041a59c4e]
resolved_user_left "_MTN/debian/rules.patch"

         conflict content
        node_type "file"
    ancestor_name "debian/rules.unpack"
 ancestor_file_id [ca6357378b71acce3b3cc98059bf887a9649bf9f]
        left_name "debian/rules.unpack"
     left_file_id [b56bf1227273a0cfdc608dff38957a402ff4391f]
       right_name "debian/rules.unpack"
    right_file_id [ca6357378b71acce3b3cc98059bf887a9649bf9f]
resolved_internal 

          conflict content
         node_type "file"
     ancestor_name "debian/rules2"
  ancestor_file_id [10bf8ee55b51b42c8f39bdd22ceb72568d726bbf]
         left_name "debian/rules2"
      left_file_id [7d379b25236ffea645fd6ebcece73b7bc862aa4f]
        right_name "debian/rules2"
     right_file_id [93adcc01a6d4e0c7c96b021cd00d4f9b88fb08c1]
resolved_user_left "_MTN/debian/rules2"

          conflict content
         node_type "file"
     ancestor_name "debian/patches/gcc-default-ssp.diff"
  ancestor_file_id [c94843266df5da124548bbfd4f8238f9a4d355d6]
         left_name "debian/patches/gcc-default-ssp.diff"
      left_file_id [3540d8679d6703e08662269bc42606815a87f6d8]
        right_name "debian/patches/gcc-default-ssp.diff"
     right_file_id [e420cc5361389aab1dc833cca029fc7989529f7a]
resolved_user_left "_MTN/debian/patches/gcc-default-ssp.diff"

         conflict content
        node_type "file"
    ancestor_name "debian/patches/gcc-hash-style-gnu.diff"
 ancestor_file_id [aa3212cd39d9cda016e184a9fe5e2e1636243b43]
        left_name "debian/patches/gcc-hash-style-gnu.diff"
     left_file_id [38e2e1ace961629bb64ddd4d69ca00ae5735dec0]
       right_name "debian/patches/gcc-hash-style-gnu.diff"
    right_file_id [aa3212cd39d9cda016e184a9fe5e2e1636243b43]
resolved_internal 

          conflict content
         node_type "file"
     ancestor_name "debian/patches/gcc-hash-style-both.diff"
  ancestor_file_id [53db01392a72069a05a25777a0b02a8c9165d0b2]
         left_name "debian/patches/gcc-hash-style-both.diff"
      left_file_id [43e08143b6b5072184e6644f320498bd66325ff5]
        right_name "debian/patches/gcc-hash-style-both.diff"
     right_file_id [ada04af50b0c2eaef17c2015b9a8d13a88ac1dc0]
resolved_user_left "_MTN/debian/patches/gcc-hash-style-both.diff"

          conflict content
         node_type "file"
     ancestor_name "debian/patches/gcc-default-relro.diff"
  ancestor_file_id [49640a0739ef3cefbdb9f4c638a5c594a199039f]
         left_name "debian/patches/gcc-default-relro.diff"
      left_file_id [710a995c471d8108ddc974acef14676a14f6d90c]
        right_name "debian/patches/gcc-default-relro.diff"
     right_file_id [59bad6d0f31ff94d16359339a8ac82349875360c]
resolved_user_left "_MTN/debian/patches/gcc-default-relro.diff"

         conflict content
        node_type "file"
    ancestor_name "debian/patches/svn-class-updates.diff"
 ancestor_file_id [9d6170b42efc0cab1ba34647129b44eea28c04b8]
        left_name "debian/patches/svn-class-updates.diff"
     left_file_id [44abe9de8ff365c423d0e78ae751dcb6e8176595]
       right_name "debian/patches/svn-class-updates.diff"
    right_file_id [9d6170b42efc0cab1ba34647129b44eea28c04b8]
resolved_internal 

         conflict content
        node_type "file"
    ancestor_name "debian/patches/svn-doc-updates.diff"
 ancestor_file_id [1a9f68e383789a838781c7df94a9836ad07d7b81]
        left_name "debian/patches/svn-doc-updates.diff"
     left_file_id [c79fe2972724df72bfd127b138f5561244b202f9]
       right_name "debian/patches/svn-doc-updates.diff"
    right_file_id [1a9f68e383789a838781c7df94a9836ad07d7b81]
resolved_internal 

          conflict content
         node_type "file"
     ancestor_name "debian/patches/svn-updates.diff"
  ancestor_file_id [1078d87b8c17aa3247098997c3ed658bae151025]
         left_name "debian/patches/svn-updates.diff"
      left_file_id [8337134ed26badf2b3a7575a65ee543478f3d7b7]
        right_name "debian/patches/svn-updates.diff"
     right_file_id [787dc7a1b7ecde31dbddcea70919a6dadf912f34]
resolved_user_left "_MTN/debian/patches/svn-updates.diff"

         conflict content
        node_type "file"
    ancestor_name "debian/patches/gcc-multiarch.diff"
 ancestor_file_id [c59f36eb773b262dd31f2e35c4e8cd4608f279a7]
        left_name "debian/patches/gcc-multiarch.diff"
     left_file_id [5c8d5cca05dd01e1acba14820f55989a6ba66577]
       right_name "debian/patches/gcc-multiarch.diff"
    right_file_id [9d1086118625e45f7704a40329556ded7d4d1f82]
resolved_internal 

         conflict content
        node_type "file"
    ancestor_name "debian/rules.sonames"
 ancestor_file_id [7fab04cca458eb060a3e4e27cf3e61ae96059631]
        left_name "debian/rules.sonames"
     left_file_id [5e6af9b818c2d957cebc100ea3ccb6ee8392a7c4]
       right_name "debian/rules.sonames"
    right_file_id [7fab04cca458eb060a3e4e27cf3e61ae96059631]
resolved_internal 

          conflict content
         node_type "file"
     ancestor_name "debian/control.m4"
  ancestor_file_id [a4fb32527e80faf5578bba9a13280a58adb17926]
         left_name "debian/control.m4"
      left_file_id [6f2f7219708cae42d40cc7c0e254259813c62798]
        right_name "debian/control.m4"
     right_file_id [76a269eb4dc30cf1693d2173a3e0bc6ce36568bf]
resolved_user_left "_MTN/debian/control.m4"

         conflict content
        node_type "file"
    ancestor_name "debian/copyright"
 ancestor_file_id [bdee597e376268b38f6c3ba2f230238041b6a671]
        left_name "debian/copyright"
     left_file_id [3ad8494a949504d140ebd4af56411bb8078dea99]
       right_name "debian/copyright"
    right_file_id [bdee597e376268b38f6c3ba2f230238041b6a671]
resolved_internal 

         conflict content
        node_type "file"
    ancestor_name "debian/patches/sparc-force-cpu.diff"
 ancestor_file_id [5c9cd2e58a921352bf4af1314963d53af36a09f2]
        left_name "debian/patches/sparc-force-cpu.diff"
     left_file_id [33fce6108e2a4334d406dfbb44aefc59d29717ca]
       right_name "debian/patches/sparc-force-cpu.diff"
    right_file_id [5c9cd2e58a921352bf4af1314963d53af36a09f2]
resolved_internal 

          conflict content
         node_type "file"
     ancestor_name "debian/patches/gold-and-ld.diff"
  ancestor_file_id [edcca4e16303f62c1a19af76f512fd5c4f077364]
         left_name "debian/patches/gold-and-ld.diff"
      left_file_id [c35b637a56e2057852940d5190069c2d17e807bc]
        right_name "debian/patches/gold-and-ld.diff"
     right_file_id [5db303140b4f13d94d6b0008340b672fe27e2494]
resolved_user_left "_MTN/debian/patches/gold-and-ld.diff"

         conflict content
        node_type "file"
    ancestor_name "debian/patches/gcc-no-add-needed.diff"
 ancestor_file_id [6ad4df0bae944cd5fa9d9e0ff5bac11bdfb88554]
        left_name "debian/patches/gcc-no-add-needed.diff"
     left_file_id [d0b79cfc9404156b7ac300bcfea0ed95f6fa774a]
       right_name "debian/patches/gcc-no-add-needed.diff"
    right_file_id [1168fa48aad37c586e1f638d10cf236f6ffeb2e0]
resolved_internal 

          conflict content
         node_type "file"
     ancestor_name "debian/patches/gcc-linaro-doc.diff"
  ancestor_file_id [4c5241cf1f1a8149db25ddec1d7b279e51bea119]
         left_name "debian/patches/gcc-linaro-doc.diff"
      left_file_id [533bc7ad3589b57c6a084400d72bd5550791d4b9]
        right_name "debian/patches/gcc-linaro-doc.diff"
     right_file_id [403555a5e744063c9f30f53829df7fbf0414fdc6]
resolved_user_left "_MTN/debian/patches/gcc-linaro-doc.diff"

          conflict content
         node_type "file"
     ancestor_name "debian/patches/gcc-linaro.diff"
  ancestor_file_id [9cb592d83ac6e06a1e6dc18afa26aa782e8879df]
         left_name "debian/patches/gcc-linaro.diff"
      left_file_id [b7c53625ce8ce9e5ab824078c05501d703f0badc]
        right_name "debian/patches/gcc-linaro.diff"
     right_file_id [dff910b48d7979089e1e556dab0b91124c07a4b8]
resolved_user_left "_MTN/debian/patches/gcc-linaro.diff"

          conflict content
         node_type "file"
     ancestor_name "debian/patches/svn-updates-linaro.diff"
  ancestor_file_id [7007576064428f9f158717e19e3fe124f004f483]
         left_name "debian/patches/svn-updates-linaro.diff"
      left_file_id [3e466f43958f37c9cde2ea5c304cf5dd837f6ebc]
        right_name "debian/patches/svn-updates-linaro.diff"
     right_file_id [1566825395c8c4a01736ab121f3faba5a7f5f742]
resolved_user_left "_MTN/debian/patches/svn-updates-linaro.diff"

         conflict content
        node_type "file"
    ancestor_name "debian/patches/gcc-as-needed.diff"
 ancestor_file_id [6bbf8948a4403ac3394133f3ae28ddf40d79b314]
        left_name "debian/patches/gcc-as-needed.diff"
     left_file_id [81e330cdc7161d47081a03388ecb8be8e848bc94]
       right_name "debian/patches/gcc-as-needed.diff"
    right_file_id [1ab10f4763f114af41725375fac0c976fffc0bf5]
resolved_internal 
