§
    Ã¿L`ÛG  ã                   ó  — d dl Z d dlZd dlZej        d          dk    r d dlZ ej        d¦  «        j        Zd dlm	Z	 ne
Zd dl	m	Z	 d„ Z ed¦  «        Z ed¦  «        Z ed¦  «        Z ed	¦  «        Z G d
„ dej        ¦  «        ZdS )é    Né   z>B)ÚStringIOc                 óD   — t          | ¦  «                             ¦   «         S )N)r   Ú	readlines)Úts    ú4/usr/lib/python3/dist-packages/merge3/test_merge3.pyÚsplit_linesr	      s   € Ý�A‰;Œ;× Ò Ñ"Ô"Ð"ó    aÌ       The Nameless is the origin of Heaven and Earth;
     The named is the mother of all things.

     Therefore let there always be non-being,
       so we may see their subtlety,
     And let there always be being,
       so we may see their outcome.
     The two are the same,
     But after they are produced,
       they have different names.
     They both may be called deep and profound.
     Deeper and more profound,
     The door of all subtleties!
aÍ       The Way that can be told of is not the eternal Way;
     The name that can be named is not the eternal name.
     The Nameless is the origin of Heaven and Earth;
     The Named is the mother of all things.
     Therefore let there always be non-being,
       so we may see their subtlety,
     And let there always be being,
       so we may see their outcome.
     The two are the same,
     But after they are produced,
       they have different names.
a        The Way that can be told of is not the eternal Way;
     The name that can be named is not the eternal name.
     The Nameless is the origin of Heaven and Earth;
     The named is the mother of all things.

     Therefore let there always be non-being,
       so we may see their subtlety,
     And let there always be being,
       so we may see their result.
     The two are the same,
     But after they are produced,
       they have different names.

       -- The Way of Lao-Tzu, tr. Wing-tsit Chan

a       The Way that can be told of is not the eternal Way;
     The name that can be named is not the eternal name.
     The Nameless is the origin of Heaven and Earth;
     The Named is the mother of all things.
     Therefore let there always be non-being,
       so we may see their subtlety,
     And let there always be being,
       so we may see their result.
     The two are the same,
     But after they are produced,
       they have different names.
<<<<<<< LAO
=======

       -- The Way of Lao-Tzu, tr. Wing-tsit Chan

>>>>>>> TAO
c                   ó¤   — e Zd Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Z	d„ Z
d	„ Zd
„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ ZdS )Ú
TestMerge3c                 óÞ  — t          j        ddgddgddg¦  «        }|                      |                     ¦   «         dg¦  «         |                      t	          |                     ¦   «         ¦  «        ddg¦  «         |                      t	          |                     ¦   «         ¦  «        dg¦  «         |                      t	          |                     ¦   «         ¦  «        dddgfg¦  «         dS )	z$No conflicts because nothing changedÚaaaÚbbb)r   é   )r   r   r   r   r   r   )r   r   r   r   r   r   )Ú	unchangedr   r   r   N)Úmerge3ÚMerge3ÚassertEqualÚfind_unconflictedÚlistÚfind_sync_regionsÚmerge_regionsÚmerge_groups©ÚselfÚm3s     r   Útest_no_changeszTestMerge3.test_no_changesi   s  € åŒ]˜E 5˜>Ø! 5˜>Ø! 5˜>ñ+ô +ˆð 	×Ò˜×-Ò-Ñ/Ô/°&°Ñ:Ô:Ð:à×ÒÝ�R×)Ò)Ñ+Ô+Ñ,Ô,Ø#Ð%7Ð8ñ	:ô 	:ð 	:ð 	×Ò�˜b×.Ò.Ñ0Ô0Ñ1Ô1Ø-Ð.ñ	0ô 	0ð 	0ð 	×Ò�˜bŸošoÑ/Ô/Ñ0Ô0Ø&¨°¨Ð7Ð8ñ	:ô 	:ð 	:ð 	:ð 	:r
   c                 ó’  — t          j        dgg d¢dg¦  «        }|                      t          |                     ¦   «         ¦  «        ddg¦  «         |                      t          |                     ¦   «         ¦  «        ddg¦  «         |                      t          |                     ¦   «         ¦  «        ddd	gfd
dgfg¦  «         d S )Nó   zz)ó   aaaó   bbbr   )r   é   r   r   r   r"   )r"   r"   r   r   r"   r"   ©Úar   r   ©r   r   r"   r$   r    r!   r   )r   r   r   r   r   r   r   r   s     r   Útest_front_insertzTestMerge3.test_front_insert{   sï   € ÝŒ]˜E˜7Ø2Ð2Ð2Ø!˜7ñ$ô $ˆð 	×Ò�˜b×2Ò2Ñ4Ô4Ñ5Ô5Ø,Ø,ð0ñ	1ô 	1ð 	1ð 	×Ò�˜b×.Ò.Ñ0Ô0Ñ1Ô1Ø%Ø-ð/ñ	0ô 	0ð 	0ð 	×Ò�˜bŸošoÑ/Ô/Ñ0Ô0Ø ¨Ð 0Ð1Ø&¨¨Ð0ð2ñ	3ô 	3ð 	3ð 	3ð 	3r
   c                 ó|  — t          j        g ddgg ¦  «        }|                      t          |                     ¦   «         ¦  «        dg¦  «         |                      t          |                     ¦   «         ¦  «        dg¦  «         |                      t          |                     ¦   «         ¦  «        ddg¦  «         d S )Nr   r   )r   r   r   r   r   r   r#   )r   r   r   r   r   r   Úmerge_linesr   s     r   Útest_null_insertzTestMerge3.test_null_insertŽ   sÉ   € ÝŒ]˜2Ø! 5˜>Øñô ˆð
 	×Ò�˜b×2Ò2Ñ4Ô4Ñ5Ô5Ø,Ð-ñ	/ô 	/ð 	/ð 	×Ò�˜b×.Ò.Ñ0Ô0Ñ1Ô1Ø%˜ñ	(ô 	(ð 	(ð 	×Ò�˜bŸnšnÑ.Ô.Ñ/Ô/Ø ˜ñ	)ô 	)ð 	)ð 	)ð 	)r
   c                 ón  — t          j        ddgg d¢ddg¦  «        }|                      |                     ¦   «         ddg¦  «         |                      t	          |                     ¦   «         ¦  «        g d¢¦  «         |                      t	          |                     ¦   «         ¦  «        g d¢¦  «         dS )	z*No conflicts because only one side changedr   r   ©r   Ú111r   ©r   r"   ©r"   r   )©r   r"   r   r"   r   r"   )r"   r   r   r   r"   r   )r   r   r   r   r   r   )r%   )r$   r"   r   ©r   r"   r   N)r   r   r   r   r   r   r   r   s     r   Útest_no_conflictszTestMerge3.test_no_conflicts�   sá   € åŒ]˜E 5˜>Ø0Ð0Ð0Ø! 5˜>ñ+ô +ˆð 	×Ò˜×-Ò-Ñ/Ô/Ø  &Ð)ñ	+ô 	+ð 	+ð 	×Ò�˜b×2Ò2Ñ4Ô4Ñ5Ô5ð0ð 0ð 0ñ	1ô 	1ð 	1ð
 	×Ò�˜b×.Ò.Ñ0Ô0Ñ1Ô1ð1ð 1ð 1ñ	2ô 	2ð 	2ð 	2ð 	2r
   c                 ó´   — t          j        ddgg d¢ddg¦  «        }|                      d                     |                     ¦   «         ¦  «        d¦  «         d S ©Núaaa
úbbb
©r4   r5   ú222
Ú zaaa
bbb
222
©r   r   r   Újoinr(   r   s     r   Útest_append_azTestMerge3.test_append_a°   sj   € ÝŒ]˜G WÐ-Ø6Ð6Ð6Ø# WÐ-ñ/ô /ˆð 	×Ò˜Ÿš §¢Ñ!1Ô!1Ñ2Ô2Ø*ñ	,ô 	,ð 	,ð 	,ð 	,r
   c                 ó´   — t          j        ddgddgg d¢¦  «        }|                      d                     |                     ¦   «         ¦  «        d¦  «         d S r3   r9   r   s     r   Útest_append_bzTestMerge3.test_append_b¸   sj   € ÝŒ]˜G WÐ-Ø# WÐ-Ø6Ð6Ð6ñ8ô 8ˆð 	×Ò˜Ÿš §¢Ñ!1Ô!1Ñ2Ô2Ø*ñ	,ô 	,ð 	,ð 	,ð 	,r
   c                 ó´   — t          j        ddgg d¢g d¢¦  «        }|                      d                     |                     ¦   «         ¦  «        d¦  «         d S r3   r9   r   s     r   Útest_append_agreementz TestMerge3.test_append_agreementÀ   sk   € ÝŒ]˜G WÐ-Ø6Ð6Ð6Ø6Ð6Ð6ñ8ô 8ˆð 	×Ò˜Ÿš §¢Ñ!1Ô!1Ñ2Ô2Ø*ñ	,ô 	,ð 	,ð 	,ð 	,r
   c                 óÄ   — t          j        ddgg d¢g d¢¦  «        }|                     ddddd	¬
¦  «        }|                      d                     |¦  «        d¦  «         d S )Nr4   r5   r6   )r4   r5   z333
r$   Úbú<<ú--ú>>©Úname_aÚname_bÚstart_markerÚ
mid_markerÚ
end_markerr8   zaaa
bbb
<< a
222
--
333
>> b
©r   r   r(   r   r:   ©r   r   Úmls      r   Útest_append_clashzTestMerge3.test_append_clashÈ   s‰   € ÝŒ]˜G WÐ-Ø6Ð6Ð6Ø6Ð6Ð6ñ8ô 8ˆð �^Š^ 3Ø#&Ø)-Ø'+Ø'+ð	 ñ -ô -ˆð
 	×Ò˜Ÿš ™œð 'ñ 	ô 	ð 	ð 	ð 	r
   c                 óÄ   — t          j        ddgg d¢g d¢¦  «        }|                     ddddd¬	¦  «        }|                      d
                     |¦  «        d¦  «         d S )Nr4   r5   ©r4   r7   r5   r$   rA   rB   rC   rD   rE   r8   zaaa
222
bbb
rK   rL   s      r   Útest_insert_agreementz TestMerge3.test_insert_agreementÜ   s}   € ÝŒ]˜G WÐ-Ø6Ð6Ð6Ø6Ð6Ð6ñ8ô 8ˆð �^Š^ 3Ø#&Ø)-Ø'+Ø'+ð	 ñ -ô -ˆð
 	×Ò˜Ÿš ™œÐ&7Ñ8Ô8Ð8Ð8Ð8r
   c                 ó|  — t          j        ddgg d¢g d¢¦  «        }|                      |                     ¦   «         ddg¦  «         |                      t	          |                     ¦   «         ¦  «        g d¢¦  «         |                      t	          |                     ¦   «         ¦  «        g d¢¦  «         |                      t	          |                     ¦   «         ¦  «        d	dgfd
g dgdgfd	dgfg¦  «         |                     ddddd¬¦  «        }|                      d 	                    |¦  «        d¦  «         dS )ú+Both try to insert lines in the same place.r4   r5   )r4   ú111
r5   rP   r-   r.   )r/   )r"   r   r   r   r   r   )r   r   r   r   r   r   )r%   )Úconflictr"   r"   r"   r   r"   r   r0   r   rU   rT   r7   r$   rA   rB   rC   rD   rE   r8   zaaa
<< a
111
--
222
>> b
bbb
N)
r   r   r   r   r   r   r   r   r(   r:   rL   s      r   Útest_insert_clashzTestMerge3.test_insert_clashè   sŽ  € åŒ]˜G WÐ-Ø6Ð6Ð6Ø6Ð6Ð6ñ8ô 8ˆð 	×Ò˜×-Ò-Ñ/Ô/Ø  &Ð)ñ	+ô 	+ð 	+ð 	×Ò�˜b×2Ò2Ñ4Ô4Ñ5Ô5ð0ð 0ð 0ñ	1ô 	1ð 	1ð
 	×Ò�˜b×.Ò.Ñ0Ô0Ñ1Ô1ð/ð /ð /ñ	0ô 	0ð 	0ð
 	×Ò�˜bŸošoÑ/Ô/Ñ0Ô0Ø&¨¨	Ð2Ø% r¨G¨9°w°iÐ@Ø&¨¨	Ð2ðñ	ô 	ð 	ð �^Š^ 3Ø#&Ø)-Ø'+Ø'+ð	 ñ -ô -ˆð
 	×Ò˜Ÿš ™œð 'ñ 	ô 	ð 	ð 	ð 	r
   c                 ó   — t          j        g d¢g d¢g d¢¦  «        }|                      |                     ¦   «         ddg¦  «         |                      t	          |                     ¦   «         ¦  «        g d¢¦  «         dS )rS   )r   Ú000r   r+   )r   Ú222r   r-   )r   r   )r/   )r   r   r   r   r   r   )r   r   r   r   r   r   N©r   r   r   r   r   r   r   s     r   Útest_replace_clashzTestMerge3.test_replace_clash  s§   € åŒ]Ð0Ð0Ð0Ø0Ð0Ð0Ø0Ð0Ð0ñ2ô 2ˆð 	×Ò˜×-Ò-Ñ/Ô/Ø  &Ð)ñ	+ô 	+ð 	+ð 	×Ò�˜b×2Ò2Ñ4Ô4Ñ5Ô5ð0ð 0ð 0ñ	1ô 	1ð 	1ð 	1ð 	1r
   c                 ó   — t          j        g d¢g d¢g d¢¦  «        }|                      |                     ¦   «         ddg¦  «         |                      t	          |                     ¦   «         ¦  «        g d¢¦  «         dS )z+Replacement with regions of different size.)r    ó   000r]   r!   )r    ó   111r^   r^   r!   )r    ó   222r_   r_   r_   r!   r-   )r   é   )r/   )r   r`   r`   é   ra   é   )r`   r`   ra   ra   rb   rb   NrZ   r   s     r   Útest_replace_multizTestMerge3.test_replace_multi  s©   € åŒ]Ð;Ð;Ð;ØCÐCÐCØKÐKÐKñMô Mˆð 	×Ò˜×-Ò-Ñ/Ô/Ø  &Ð)ñ	+ô 	+ð 	+ð 	×Ò�˜b×2Ò2Ñ4Ô4Ñ5Ô5ð0ð 0ð 0ñ	1ô 	1ð 	1ð 	1ð 	1r
   c                 óÌ   — t          j        t          t          t          ¦  «        }t          |                     dd¦  «        ¦  «        }|                      |t          ¦  «         dS )úTest case from diff3 manualÚLAOÚTAON©	r   r   ÚTZUrf   rg   r   r(   r   ÚMERGED_RESULTrL   s      r   Útest_merge_poemzTestMerge3.test_merge_poem,  sL   € åŒ]�3¥¥SÑ)Ô)ˆÝ�"—.’. ¨Ñ.Ô.Ñ/Ô/ˆØ×Ò˜�]Ñ+Ô+Ð+Ð+Ð+r
   c                 ó  — t          j        d„ t          D ¦   «         d„ t          D ¦   «         d„ t          D ¦   «         ¦  «        }t          |                     dd¦  «        ¦  «        }|                      |d„ t          D ¦   «         ¦  «         dS )re   c                 ó6   — g | ]}|                      ¦   «         ‘ŒS © ©Úencode©Ú.0Úlines     r   ú
<listcomp>z4TestMerge3.test_merge_poem_bytes.<locals>.<listcomp>5  ó    € Ð+Ð+Ð+˜tˆT�[Š[‰]Œ]Ð+Ð+Ð+r
   c                 ó6   — g | ]}|                      ¦   «         ‘ŒS rn   ro   rq   s     r   rt   z4TestMerge3.test_merge_poem_bytes.<locals>.<listcomp>6  ru   r
   c                 ó6   — g | ]}|                      ¦   «         ‘ŒS rn   ro   rq   s     r   rt   z4TestMerge3.test_merge_poem_bytes.<locals>.<listcomp>7  ru   r
   rf   rg   c                 ó6   — g | ]}|                      ¦   «         ‘ŒS rn   ro   rq   s     r   rt   z4TestMerge3.test_merge_poem_bytes.<locals>.<listcomp>:  s    € Ð9Ð9Ð9 4�—’‘”Ð9Ð9Ð9r
   Nrh   rL   s      r   Útest_merge_poem_bytesz TestMerge3.test_merge_poem_bytes2  s™   € åŒ]Ø+Ð+¥sÐ+Ñ+Ô+Ø+Ð+¥sÐ+Ñ+Ô+Ø+Ð+¥sÐ+Ñ+Ô+ñ-ô -ˆõ �"—.’. ¨Ñ.Ô.Ñ/Ô/ˆØ×ÒØÐ9Ð9­=Ð9Ñ9Ô9ñ	;ô 	;ð 	;ð 	;ð 	;r
   c                 óT  — d                      d¦  «        }d                      d¦  «        }d                      d¦  «        }t          j        |||¦  «        }|                     ddd¬¦  «        }d                     t          |¦  «        ¦  «        }d	}|                      ||¦  «         d
S )ÚReprocessingú(a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
Tú(a
a
a
a
a
a
a
a
a
a
b
b
b
b
b
b
b
b
b
b
ú(a
a
a
a
a
a
a
a
a
a
c
b
b
b
b
b
b
b
b
c
ÚOTHERÚTHIS©Ú	reprocessr8   zra
a
a
a
a
a
a
a
a
a
<<<<<<< OTHER
c
=======
>>>>>>> THIS
b
b
b
b
b
b
b
b
<<<<<<< OTHER
c
=======
b
b
>>>>>>> THIS
N)Ú
splitlinesr   r   r(   r:   r   r   )r   Ú	base_textÚ	this_textÚ
other_textr   Úm_linesÚmerged_textÚoptimal_texts           r   Útest_minimal_conflicts_commonz(TestMerge3.test_minimal_conflicts_common<  s¤   € à×+Ò+¨DÑ1Ô1ˆ	Ø*×6Ò6°tÑ<Ô<ˆ	Ø:×FÒFÀtÑLÔLˆ
ÝŒ]˜9 j°)Ñ<Ô<ˆØ—.’. ¨&¸D�.ÑAÔAˆØ—g’g�d 7™mœmÑ,Ô,ˆðð 	ð
 	×Ò˜ {Ñ3Ô3Ð3Ð3Ð3r
   c                 ól  — d}d}d}t          j        |                     d¦  «        |                     d¦  «        |                     d¦  «        ¦  «        }|                      |                     ¦   «         g ¦  «         |                      t          |                     ¦   «         ¦  «        dg¦  «         d S )Nzba
b
zba
úa
b
c
T)r   r   r   r   r"   r"   )r   r   rƒ   r   r   r   r   )r   r„   r…   r†   r   s        r   Útest_cherrypickzTestMerge3.test_cherrypickK  s­   € Øˆ	Øˆ	Ø ˆ
åŒ]Ø× Ò  Ñ&Ô&Ø×!Ò! $Ñ'Ô'Ø× Ò  Ñ&Ô&ñ(ô (ˆð
 	×Ò˜×-Ò-Ñ/Ô/°Ñ4Ô4Ð4à×Ò�˜b×2Ò2Ñ4Ô4Ñ5Ô5Ð8JÐ7KÑLÔLÐLÐLÐLr
   c                 ó¸  — 	 ddl }n%# t          $ r |                      d¦  «         Y nw xY wd                     d¦  «        }d                     d¦  «        }d                     d¦  «        }t	          j        ||||j        ¬¦  «        }|                     d	d
d¬¦  «        }d                     t          |¦  «        ¦  «        }d}|  
                    ||¦  «         dS )r{   r   Nzpatiencediff not availabler|   Tr}   r~   )Úsequence_matcherr   r€   r�   r8   z_a
a
a
a
a
a
a
a
a
a
<<<<<<< OTHER
c
b
b
b
b
b
b
b
b
c
=======
b
b
b
b
b
b
b
b
b
b
>>>>>>> THIS
)ÚpatiencediffÚImportErrorÚskipTestrƒ   r   r   ÚPatienceSequenceMatcherr(   r:   r   r   )	r   r�   r„   r…   r†   r   r‡   rˆ   r‰   s	            r   Ú/test_minimal_conflicts_common_with_patiencediffz:TestMerge3.test_minimal_conflicts_common_with_patiencediffY  s	  € ð	8ØÐÐÐÐøÝð 	8ð 	8ð 	8Ø�MŠMÐ6Ñ7Ô7Ð7Ð7Ð7ð	8øøøà×+Ò+¨DÑ1Ô1ˆ	Ø*×6Ò6°tÑ<Ô<ˆ	Ø:×FÒFÀtÑLÔLˆ
ÝŒ]Ø�z 9Ø)ÔAðCñ Cô Cˆð —.’.Ø˜¨4ð !ñ 1ô 1ˆà—g’g�d 7™mœmÑ,Ô,ˆð,ð 	ð 	×Ò˜ {Ñ3Ô3Ð3Ð3Ð3s   ‚ ‡)¨)c                 ó~  — d„ } |d¦  «        } |d¦  «        } |d¦  «        }t          j        |||¦  «        }|                     ddd¬¦  «        }d	                     t	          |¦  «        ¦  «        }d	                      |d¦  «        d
gz    |d¦  «        z   dgz   ¦  «        }|                      ||¦  «         d S )Nc                 ó   — d„ | D ¦   «         S )ú)Add a newline to each entry in the stringc                 ó   — g | ]}|d z   ‘ŒS ©ú
rn   ©rr   Úxs     r   rt   zQTestMerge3.test_minimal_conflicts_unique.<locals>.add_newline.<locals>.<listcomp>q  ó   € Ð(Ð(Ð( �Q�t‘VÐ(Ð(Ð(r
   rn   ©Úss    r   Úadd_newlinez=TestMerge3.test_minimal_conflicts_unique.<locals>.add_newlineo  ó   € à(Ð( aÐ(Ñ(Ô(Ð(r
   ÚabcdefghijklmÚabcdefghijklmNOPQRSTUVWXYZÚabcdefghijklm1OPQRSTUVWXY2r   r€   Tr�   r8   z'<<<<<<< OTHER
1
=======
N
>>>>>>> THIS
ÚOPQRSTUVWXYz'<<<<<<< OTHER
2
=======
Z
>>>>>>> THIS
©r   r   r(   r:   r   r   ©	r   r    r„   r…   r†   r   r‡   rˆ   r‰   s	            r   Útest_minimal_conflicts_uniquez(TestMerge3.test_minimal_conflicts_uniquen  së   € ð	)ð 	)ð 	)ð  �K Ñ0Ô0ˆ	Ø�KÐ <Ñ=Ô=ˆ	Ø �[Ð!=Ñ>Ô>ˆ
ÝŒ]˜9 j°)Ñ<Ô<ˆØ—.’. ¨&¸D�.ÑAÔAˆØ—g’g�d 7™mœmÑ,Ô,ˆØ—w’wØˆK˜Ñ(Ô(Ø=Ð>ñ?àˆk˜-Ñ(Ô(ñ)ð >Ð>ñ?ñô ˆð 	×Ò˜ {Ñ3Ô3Ð3Ð3Ð3r
   c                 ó~  — d„ } |d¦  «        } |d¦  «        } |d¦  «        }t          j        |||¦  «        }|                     ddd¬¦  «        }d	                     t	          |¦  «        ¦  «        }d	                      |d
¦  «        dgz    |d¦  «        z   dgz   ¦  «        }|                      ||¦  «         d S )Nc                 ó   — d„ | D ¦   «         S )r—   c                 ó   — g | ]}|d z   ‘ŒS r™   rn   r›   s     r   rt   zTTestMerge3.test_minimal_conflicts_nonunique.<locals>.add_newline.<locals>.<listcomp>„  r�   r
   rn   rž   s    r   r    z@TestMerge3.test_minimal_conflicts_nonunique.<locals>.add_newline‚  r¡   r
   ÚabacddefgghijÚabacddefgghijkalmontfprzÚabacddefgghijknlmontfprdr   r€   Tr�   r8   Úabacddefgghijkz'<<<<<<< OTHER
n
=======
a
>>>>>>> THIS
Úlmontfprz'<<<<<<< OTHER
d
=======
z
>>>>>>> THIS
r¦   r§   s	            r   Ú test_minimal_conflicts_nonuniquez+TestMerge3.test_minimal_conflicts_nonunique�  sì   € ð	)ð 	)ð 	)ð  �K Ñ0Ô0ˆ	Ø�KÐ :Ñ;Ô;ˆ	Ø �[Ð!;Ñ<Ô<ˆ
ÝŒ]˜9 j°)Ñ<Ô<ˆØ—.’. ¨&¸D�.ÑAÔAˆØ—g’g�d 7™mœmÑ,Ô,ˆØ—w’wØˆKÐ(Ñ)Ô)Ø=Ð>ñ?àˆk˜*Ñ%Ô%ñ&ð >Ð>ñ?ñô ˆð 	×Ò˜ {Ñ3Ô3Ð3Ð3Ð3r
   c                 ó.  — d                      d¦  «        }d                      d¦  «        }d                      d¦  «        }t          j        |||¦  «        }|                     dddd¬¦  «        }|                      t          j        t          |¦  «         d	S )
z.Reprocessing and showing base breaks correctlyr|   Tr}   r~   r   r€   z|||||||)r‚   Úbase_markerN)rƒ   r   r   r(   ÚassertRaisesÚCantReprocessAndShowBaser   ©r   r„   r…   r†   r   r‡   s         r   Útest_reprocess_and_basez"TestMerge3.test_reprocess_and_base”  s�   € à×+Ò+¨DÑ1Ô1ˆ	Ø(×4Ò4°TÑ:Ô:ˆ	Ø6×BÒBÀ4ÑHÔHˆ
ÝŒ]˜9 j°)Ñ<Ô<ˆØ—.’. ¨&¸DØ-6ð !ñ 8ô 8ˆà×Ò�&Ô9½4ÀÑIÔIÐIÐIÐIr
   c                 óH  — d}d}d}t          j        |                     d¦  «        |                     d¦  «        |                     d¦  «        ¦  «        }|                     dd¦  «        }|                      d                     d¦  «        t          |¦  «        ¦  «         d S )Nza
zb
zc
Tr   r€   z,<<<<<<< OTHER
c
=======
b
>>>>>>> THIS
©r   r   rƒ   r(   r   r   r¶   s         r   Útest_dos_textzTestMerge3.test_dos_textž  sª   € Øˆ	Øˆ	Øˆ
ÝŒ]˜9×/Ò/°Ñ5Ô5Ø%×0Ò0°Ñ6Ô6Ø$×/Ò/°Ñ5Ô5ñ7ô 7ˆð —.’. ¨&Ñ1Ô1ˆØ×Òðß)šz¨$Ñ/Ô/µ°g±´ñ	@ô 	@ð 	@ð 	@ð 	@r
   c                 óH  — d}d}d}t          j        |                     d¦  «        |                     d¦  «        |                     d¦  «        ¦  «        }|                     dd¦  «        }|                      d                     d¦  «        t          |¦  «        ¦  «         d S )NzazbzcTr   r€   z'<<<<<<< OTHERc=======b>>>>>>> THISr¹   r¶   s         r   Útest_mac_textzTestMerge3.test_mac_textª  s¥   € Øˆ	Øˆ	Øˆ
ÝŒ]˜9×/Ò/°Ñ5Ô5Ø%×0Ò0°Ñ6Ô6Ø$×/Ò/°Ñ5Ô5ñ7ô 7ˆð —.’. ¨&Ñ1Ô1ˆØ×Òðß'šZ¨Ñ-Ô-­t°G©}¬}ñ	>ô 	>ð 	>ð 	>ð 	>r
   c                 óJ  — d}d}d}t          j        |                     d¦  «        |                     d¦  «        |                     d¦  «        d¬¦  «        }|                     ¦   «         }|                      dd                     |¦  «        ¦  «         t          j        |                     d¦  «        |                     d¦  «        |                     d¦  «        d¬¦  «        }|                     ¦   «         }|                      dd                     |¦  «        ¦  «         d S )	Nza
b
za
rŒ   T©Úis_cherrypickza
<<<<<<<
=======
c
>>>>>>>
r8   za
<<<<<<<
b
c
=======
>>>>>>>
©r   r   rƒ   r(   r   r:   r¶   s         r   Útest_merge3_cherrypickz!TestMerge3.test_merge3_cherrypick¶  s-  € Øˆ	Øˆ	Ø ˆ
åŒ]˜9×/Ò/°Ñ5Ô5Ø$×/Ò/°Ñ5Ô5Ø%×0Ò0°Ñ6Ô6ÀdðLñ Lô Lˆð —.’.Ñ"Ô"ˆØ×ÒÐ<ØŸš Ñ)Ô)ñ	+ô 	+ð 	+õ Œ]˜9×/Ò/°Ñ5Ô5Ø%×0Ò0°Ñ6Ô6Ø$×/Ò/°Ñ5Ô5ÀTðKñ Kô Kˆð —.’.Ñ"Ô"ˆØ×ÒÐ?ØŸš Ñ)Ô)ñ	+ô 	+ð 	+ð 	+ð 	+r
   c                 ó.  — d}d}d}t          j        |                     d¦  «        |                     d¦  «        |                     d¦  «        d¬¦  «        }|                     ¦   «         }|                      dd                     |¦  «        ¦  «         d S )Nz
a
b
c
d
e
za
b
q
za
b
c
d
f
e
g
Tr¾   z:a
b
<<<<<<<
q
=======
f
>>>>>>>
<<<<<<<
=======
g
>>>>>>>
r8   rÀ   r¶   s         r   Útest_merge3_cherrypick_w_mixedz)TestMerge3.test_merge3_cherrypick_w_mixedÊ  s§   € Ø%ˆ	Øˆ	Ø,ˆ
åŒ]˜9×/Ò/°Ñ5Ô5Ø$×/Ò/°Ñ5Ô5Ø%×0Ò0°Ñ6Ô6ÀdðLñ Lô Lˆð —.’.Ñ"Ô"ˆØ×Òð 
%ð Ÿš Ñ)Ô)ñ	+ô 	+ð 	+ð 	+ð 	+r
   c                 óä  — d„ t          d¦  «        D ¦   «         }d„ t          d¦  «        D ¦   «         }d„ t          d¦  «        D ¦   «         }t          j        |||¦  «        }|                      g d¢t	          |                     ¦   «         ¦  «        ¦  «         |                      dd	gfd
d„ t          d¦  «        D ¦   «         fddgfgt	          |                     ¦   «         ¦  «        ¦  «         dS )z´Objects other than strs may be used with Merge3.

        merge_groups and merge_regions work with non-str input.  Methods that
        return lines like merge_lines fail.
        c                 óJ   — g | ] }t          |¦  «        t          |¦  «        f‘Œ!S rn   ©Úint2byter›   s     r   rt   z1TestMerge3.test_allow_objects.<locals>.<listcomp>æ  s)   € ÐHÐHÐH¨q•˜!‘”�h q™kœkÐ*ÐHÐHÐHr
   s   abcdec                 óJ   — g | ] }t          |¦  «        t          |¦  «        f‘Œ!S rn   rÆ   r›   s     r   rt   z1TestMerge3.test_allow_objects.<locals>.<listcomp>ç  ó)   € ÐFÐFÐF¨A�h�q‰kŒk�8 A™;œ;Ð'ÐFÐFÐFr
   s   abcdefc                 óJ   — g | ] }t          |¦  «        t          |¦  «        f‘Œ!S rn   rÆ   r›   s     r   rt   z1TestMerge3.test_allow_objects.<locals>.<listcomp>è  rÉ   r
   s   Zabcde))rA   r   r"   )r   r   ra   )r$   ra   rb   rA   )ó   ZrË   r   c                 óJ   — g | ] }t          |¦  «        t          |¦  «        f‘Œ!S rn   rÆ   r›   s     r   rt   z1TestMerge3.test_allow_objects.<locals>.<listcomp>ñ  s<   € ð Jð Jð JØ01•(˜1‘+”+�x¨™{œ{Ð+ðJð Jð Jr
   r$   )ó   frÍ   N)Ú	bytearrayr   r   r   r   r   r   )r   Úbaser$   rA   r   s        r   Útest_allow_objectszTestMerge3.test_allow_objectsà  s/  € ð IÐHµI¸hÑ4GÔ4GÐHÑHÔHˆØFÐFµ¸9Ñ1EÔ1EÐFÑFÔFˆØFÐFµ¸9Ñ1EÔ1EÐFÑFÔFˆÝŒ]˜4  AÑ&Ô&ˆØ×Òðð ð õ �×!Ò!Ñ#Ô#Ñ$Ô$ñ		&ô 	&ð 	&ð
 	×ÒØ�L�>Ð"Øð Jð JÝ5>¸xÑ5HÔ5HðJñ Jô Jð Kà�L�>Ð"ð$õ �—’Ñ"Ô"Ñ#Ô#ñ	%ô 	%ð 	%ð 	%ð 	%r
   N)Ú__name__Ú
__module__Ú__qualname__r   r&   r)   r1   r;   r=   r?   rN   rQ   rV   r[   rc   rk   ry   rŠ   r�   r”   r¨   r±   r·   rº   r¼   rÁ   rÃ   rÐ   rn   r
   r   r   r   g   s•  € € € € € ð:ð :ð :ð$3ð 3ð 3ð&)ð )ð )ð2ð 2ð 2ð&,ð ,ð ,ð,ð ,ð ,ð,ð ,ð ,ðð ð ð(
9ð 
9ð 
9ð&ð &ð &ðP1ð 1ð 1ð1ð 1ð 1ð,ð ,ð ,ð;ð ;ð ;ð4ð 4ð 4ðMð Mð Mð4ð 4ð 4ð*4ð 4ð 4ð&4ð 4ð 4ð&Jð Jð Jð
@ð 
@ð 
@ð
>ð 
>ð 
>ð+ð +ð +ð(+ð +ð +ð,%ð %ð %ð %ð %r
   r   )r   ÚunittestÚsysÚversion_infoÚstructÚStructÚpackrÇ   Úior   Úchrr	   ri   rf   rg   rj   ÚTestCaser   rn   r
   r   ú<module>rÝ      s.  ðð" €€€Ø €€€Ø 
€
€
€
àÔ�AÔ˜!ÒÐØ€M€M€MØˆvŒ}˜TÑ"Ô"Ô'€HØÐÐÐÐÐÐà€HØ!Ð!Ð!Ð!Ð!Ð!ð#ð #ð #ð €kð ñ ô €ð €kð ñ ô €ð €kð ñ ô €ð" �ð ñ ô €ð(M%ð M%ð M%ð M%ð M%�Ô"ñ M%ô M%ð M%ð M%ð M%r
   