update discard file changes test
This commit is contained in:
Jesse Duffield
@@ -1 +1,23 @@
|
||||
three
|
||||
Merge branch 'conflict' into conflict_second
|
||||
|
||||
# Conflicts:
|
||||
# added-them-changed-us.txt
|
||||
# both-added.txt
|
||||
# both-deleted.txt
|
||||
# both-modded.txt
|
||||
# changed-them-added-us.txt
|
||||
# deleted-them.txt
|
||||
# deleted-us.txt
|
||||
#
|
||||
# It looks like you may be committing a merge.
|
||||
# If this is not correct, please remove the file
|
||||
# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/discardFileChanges/actual/.git/MERGE_HEAD
|
||||
# and try again.
|
||||
|
||||
|
||||
# Please enter the commit message for your changes. Lines starting
|
||||
# with '#' will be ignored, and an empty message aborts the commit.
|
||||
#
|
||||
# On branch conflict_second
|
||||
# All conflicts fixed but you are still merging.
|
||||
#
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
38b645bf2388b21695d22d7f673d87971a78e4ad
|
||||
@@ -1,10 +0,0 @@
|
||||
Merge branch 'conflict' into conflict_second
|
||||
|
||||
# Conflicts:
|
||||
# added-them-changed-us.txt
|
||||
# both-added.txt
|
||||
# both-deleted.txt
|
||||
# both-modded.txt
|
||||
# changed-them-added-us.txt
|
||||
# deleted-them.txt
|
||||
# deleted-us.txt
|
||||
@@ -1 +1 @@
|
||||
c64dd6aea3efd197ed630dedc1ffb538d35c3fdb
|
||||
3633f8c997d88e0c59202f498c8344da9da3aaf4
|
||||
|
||||
Binary file not shown.
@@ -1,7 +1,8 @@
|
||||
0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 commit (initial): one
|
||||
0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in added-them-changed-us.txt
|
||||
eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100 commit: two
|
||||
38b645bf2388b21695d22d7f673d87971a78e4ad 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 checkout: moving from conflict to conflict_second
|
||||
0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in changed-them-added-us.txt
|
||||
698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 commit: three
|
||||
c64dd6aea3efd197ed630dedc1ffb538d35c3fdb c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 reset: moving to conflict_second
|
||||
0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 commit (initial): one
|
||||
459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI <CI@example.com> 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt
|
||||
0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI <CI@example.com> 1617582376 +1000 commit: two
|
||||
837fbbc4ee6892b828a4a94be22c39814146aafb 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 checkout: moving from conflict to conflict_second
|
||||
459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI <CI@example.com> 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt
|
||||
3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000 commit: three
|
||||
3633f8c997d88e0c59202f498c8344da9da3aaf4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000 reset: moving to conflict_second
|
||||
3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI <CI@example.com> 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 commit (initial): one
|
||||
0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in added-them-changed-us.txt
|
||||
eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100 commit: two
|
||||
0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 commit (initial): one
|
||||
459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI <CI@example.com> 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt
|
||||
0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI <CI@example.com> 1617582376 +1000 commit: two
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 branch: Created from conflict
|
||||
0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in changed-them-added-us.txt
|
||||
698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 commit: three
|
||||
0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 branch: Created from conflict
|
||||
459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI <CI@example.com> 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt
|
||||
3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000 commit: three
|
||||
3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI <CI@example.com> 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second
|
||||
|
||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
x<01>ÍA
|
||||
Â@ @Q×sŠì ’¤cR¡ˆÐU<C390>‘ §”)x|{„n?~ª¥¼PäKÛÜ¡GÔtO¨K Ð̔ʔ£kvæEt¶·WÝ`šaœæ§ÿ¬¬ ¿¦Z @BÂØã<C398> #B G=&ÍOòP¿ þIÔ*Ê
|
||||
@@ -0,0 +1,2 @@
|
||||
xЌОНЉВ0ЕqЧyЉ» *IуХЂ ®|Њ$чФ
|
||||
¦•z вё=ь9ькЦЪMhtъ ;@HЮ3‚Fґc°ОivБД„д"кTЖ¤Gzд «ђуiО^џgж2Ґl№VfМ6‹џ9:ЦОЁь’eЫй|ЎУщт‡wnЏ;Ћukїd‚‰~кЇ‘~ЊЦZхµЈ_жЄlІ Њ;|”·P§е¦ЫJuЙл<И‚6д.гбхьDк ЦКK`
|
||||
@@ -0,0 +1,2 @@
|
||||
x<01>ÎM
|
||||
Â0@a×9Eö‚äºê1f¦3([J<04>o<EFBFBD>àöñ ¯½?‡õ-œÆ.bsc‚ŠÚ©¦ê#19âJ@—¥_(<28>Ùp—÷°1$@e(Àªž[UÉÀ¹¬¥ä˜PpŠÉàg<ÖÝN³½Nó]¾Ø·—\xí7닇\C°gïœ3G=PCþÜÍx tóßí:L
|
||||
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,3 @@
|
||||
xŤÍÁ
|
||||
Â0 €aĎ}ŠÜI˛šT<C5A1>1ŘiŹ‘•kǨŕă»GđúóÁź[ĎůÔww5ß2ęZš™ňJ…Šbt-n Ł<>¦`źţh;Ě ÜçeňŻŐíĺ—Üę$¤×Ä<C397>
|
||||
ś ĂQŹI÷?yho?P*ň
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
x<01>ÎA
|
||||
Â0@Q×9Eö‚ÌLÒd"BW=F&™ `l)<¾=‚ÛÏ_¼²öþ <13>Æ®j§TZ”ȹ¥œ…=£“" …E)¶Za³å]ßÆÄJè1…¦<15>E<j¥ÚœH.Ñ›ü<19>u·ób¯ór×oîÛK/eí7‹<03>ƒ‰ìÀ õ@
|
||||
@@ -1 +0,0 @@
|
||||
x<01>ŽAjÃ0E»Ö)f_ F²$[PJ!« c$}Õ<>Èîrü:7Èò=Þâ•÷«’óü¡;@à9K.1[N<>mÞA²„6%DÄ4N˜Ì]v¬JŒPR«~œFW„£O>"•0»Vc³!M“¯yöF ºl;<3B>/ôu¾üà)ý~élý›l´ÑñÈÁÒ§µÌæ°Ç”âÍÜäM—¡âE=éSéX“ŽJו¤VÔAô¡,²þ ðø{Eæ VJK–
|
||||
@@ -1 +1 @@
|
||||
38b645bf2388b21695d22d7f673d87971a78e4ad
|
||||
837fbbc4ee6892b828a4a94be22c39814146aafb
|
||||
|
||||
@@ -1 +1 @@
|
||||
c64dd6aea3efd197ed630dedc1ffb538d35c3fdb
|
||||
39d62c8a07e5103fef16c32373738ce92c4549b7
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
||||
{ "description": "discard file changes for various kinds of situations (merge conflicts, etc)", "speed": 2 }
|
||||
{ "description": "discard file changes for various kinds of situations (merge conflicts, etc)", "speed": 3 }
|
||||
|
||||
Reference in New Issue
Block a user