u/pc/rhodecode-enterprise-ce-fork-pc Files · rhodecode/tests/fixtures/git_diff_binary_special_files.diff

subrepo: Handle subrepo merge errors.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r1108:ebe0247c

default

Download file

             git_diff_binary_special_files.diff
        
                    22 lines
            
             | 1.1 KiB
            
                | text/x-diff
            
             |
                DiffLexer
            
             / rhodecode / tests / fixtures / git_diff_binary_special_files.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff --git "a/css/_Icon\r" "b/css/_Icon\r"

      new file mode 100644

      index 0000000000000000000000000000000000000000..2f3530fdf229761447c06b05f0d917035c64746f

      GIT binary patch

      literal 4473

      zcmd?RXLMuNl`eQ0i&d;rRY_IKvL!26wrokZ9Hh3|l4Z+n#mbSzP|P`i1W7RATqGhA

      zIT0Bk00JZt7yzOGkSr#Vta7DStkRR@Y4`M-ezW?mS<~}#-db<od<SKB+wOkqKl6SK

      za4&Ae`S#vtpR~{3hbek=50lR@pIoka_SmUs&p-Qz5533i#r{L=zs63l`<deZa1h7b

      z=iNUX|MlS)r%#{!!`*%y>Hcqg@))N0&hMDw+rPs@it_)jPx0;l*i_Tr4gUY*>0`fq

      z7R>*qsrwDcA>Y&eW?Kux<drnF((66Dt-0&MlBOPdJ+RZ0yMDK%spj=JnY{1)-#EU-

      z6n^pMAOAnbFoo>vOyMX~^t#b#FupEf4!`^}A`}RJ{_}U<dH3D--h1cecQ(mqrCXa<

      zuVxbqv$5FQ@38aVOXzE=TAY55)BRUJ3j{-<nfjKt`XQHX-16p6JwBgzx|P$@Hsm&&

      zj6eO6gV^5<SXx>+ev4M8{m~m^dY#T<&<>gPYK21jqaTjS<eeXVa_Y?S4^Q*Nf*-s-

      zI4u6vC&x~lIR5Der`dtmU+e5<|K=Eb{K*raoF`qczt++@B+_YhI<0<8G}!vu%P+j}

      z?e7U*JNoLYue|ue%TF>)$#XA!>!lZ7eC~xOOPI&Tn4;${p1*kUxlx9>$SyJ$B}~!r

      zYLCzB6Vx-cq(1Lh4g0(OzyI=!`}cP5+`94Gs+ybZ^`jAqK$Tft&MsG#uWxK@Zp(EB

      zg>#u?^2^IM$m-Ku8jDr$SV^Tamo6@6ve~r-y}`VaUPvsKonIu0AExJHu7$bz+1dH?

      z7vizFsgpA}+}l3riAFD;n+io*dU%6F1HGMt;qZlXKF?G~KaWQS_xAEb{_|(;R=-~u

      m;2grSx>@)B$?Sp$6GQ-I0J!h|AdvNaq@`hh|Dbb}HTr+C;>2YD

      literal 0

      HcmV?d00001

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				diff --git "a/css/_Icon\r" "b/css/_Icon\r"
				new file mode 100644
				index 0000000000000000000000000000000000000000..2f3530fdf229761447c06b05f0d917035c64746f
				GIT binary patch
				literal 4473
				zcmd?RXLMuNl`eQ0i&d;rRY_IKvL!26wrokZ9Hh3\|l4Z+n#mbSzP\|P`i1W7RATqGhA
				zIT0Bk00JZt7yzOGkSr#Vta7DStkRR@Y4`M-ezW?mS<~}#-db<od<SKB+wOkqKl6SK
				za4&Ae`S#vtpR~{3hbek=50lR@pIoka_SmUs&p-Qz5533i#r{L=zs63l`<deZa1h7b
				z=iNUX\|MlS)r%#{!!`%y>Hcqg@))N0&hMDw+rPs@it_)jPx0;li_Tr4gUY*>0`fq
				z7R>*qsrwDcA>Y&eW?Kux<drnF((66Dt-0&MlBOPdJ+RZ0yMDK%spj=JnY{1)-#EU-
				z6n^pMAOAnbFoo>vOyMX~^t#b#FupEf4!`^}A`}RJ{_}U<dH3D--h1cecQ(mqrCXa<
				zuVxbqv$5FQ@38aVOXzE=TAY55)BRUJ3j{-<nfjKt`XQHX-16p6JwBgzx\|P$@Hsm&&
				zj6eO6gV^5<SXx>+ev4M8{m~m^dY#T<&<>gPYK21jqaTjS<eeXVa_Y?S4^QNf-s-
				zI4u6vC&x~lIR5Der`dtmU+e5<\|K=Eb{K*raoF`qczt++@B+_YhI<0<8G}!vu%P+j}
				z?e7UJNoLYue\|ue%TF>)$#XA!>!lZ7eC~xOOPI&Tn4;${p1kUxlx9>$SyJ$B}~!r
				zYLCzB6Vx-cq(1Lh4g0(OzyI=!`}cP5+`94Gs+ybZ^`jAqK$Tft&MsG#uWxK@Zp(EB
				zg>#u?^2^IM$m-Ku8jDr$SV^Tamo6@6ve~r-y}`VaUPvsKonIu0AExJHu7$bz+1dH?
				z7vizFsgpA}+}l3riAFD;n+io*dU%6F1HGMt;qZlXKF?G~KaWQS_xAEb{_\|(;R=-~u
				m;2grSx>@)B$?Sp$6GQ-I0J!h\|AdvNaq@`hh\|Dbb}HTr+C;>2YD

				literal 0
				HcmV?d00001