mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-06-20 01:19:23 +02:00
migrate merge conflict undo test
This commit is contained in:
Jesse Duffield
@@ -1 +0,0 @@
|
||||
asd
|
||||
@@ -1 +0,0 @@
|
||||
ref: refs/heads/other_branch
|
||||
@@ -1 +0,0 @@
|
||||
82db6d0e4502f489719ea0f3dbe7e14413c6d28a
|
||||
@@ -1,9 +0,0 @@
|
||||
Merge branch 'develop' into other_branch
|
||||
|
||||
# Conflicts:
|
||||
# directory/file
|
||||
# directory/file2
|
||||
# file1
|
||||
# file3
|
||||
# file4
|
||||
# file5
|
||||
@@ -1 +0,0 @@
|
||||
8cd762c119834784fdbf97e9bb3b4c15e804ebaa
|
||||
@@ -1,10 +0,0 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = false
|
||||
logallrefupdates = true
|
||||
ignorecase = true
|
||||
precomposeunicode = true
|
||||
[user]
|
||||
email = CI@example.com
|
||||
name = CI
|
||||
@@ -1 +0,0 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
Binary file not shown.
@@ -1,7 +0,0 @@
|
||||
# git ls-files --others --exclude-from=.git/info/exclude
|
||||
# Lines that start with '#' are comments.
|
||||
# For a project mostly in C, the following would be a good set of
|
||||
# exclude patterns (uncomment them if you want to use them):
|
||||
# *.[oa]
|
||||
# *~
|
||||
.DS_Store
|
||||
@@ -1,33 +0,0 @@
|
||||
0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI <CI@example.com> 1617671430 +1000 commit (initial): first commit
|
||||
31f2a971f823279ba1ef877be7599da288f6e24b 31f2a971f823279ba1ef877be7599da288f6e24b CI <CI@example.com> 1617671430 +1000 checkout: moving from master to feature/cherry-picking
|
||||
31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI <CI@example.com> 1617671430 +1000 commit: first commit freshman year
|
||||
3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI <CI@example.com> 1617671430 +1000 commit: second commit subway eat fresh
|
||||
d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI <CI@example.com> 1617671430 +1000 commit: third commit fresh
|
||||
dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI <CI@example.com> 1617671430 +1000 commit: fourth commit cool
|
||||
687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI <CI@example.com> 1617671430 +1000 commit: fifth commit nice
|
||||
17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI <CI@example.com> 1617671430 +1000 commit: sixth commit haha
|
||||
c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI <CI@example.com> 1617671430 +1000 commit: seventh commit yeah
|
||||
5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI <CI@example.com> 1617671430 +1000 commit: eighth commit woo
|
||||
c50f7e1375a30118c2886d4b31318579f3419231 c50f7e1375a30118c2886d4b31318579f3419231 CI <CI@example.com> 1617671430 +1000 checkout: moving from feature/cherry-picking to develop
|
||||
c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI <CI@example.com> 1617671430 +1000 commit: first commit on develop
|
||||
18c07ac9568c564ececb199f78f64babc92214cb 31f2a971f823279ba1ef877be7599da288f6e24b CI <CI@example.com> 1617671430 +1000 checkout: moving from develop to master
|
||||
31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI <CI@example.com> 1617671430 +1000 commit: first commit on master
|
||||
442a53c1b023b4816085fdc4eaa85d0c5fd897e2 18c07ac9568c564ececb199f78f64babc92214cb CI <CI@example.com> 1617671430 +1000 checkout: moving from master to develop
|
||||
18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI <CI@example.com> 1617671430 +1000 commit: second commit on develop
|
||||
7bc178be031c4645110e9accb4accf16902d2d7f 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI <CI@example.com> 1617671430 +1000 checkout: moving from develop to master
|
||||
442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI <CI@example.com> 1617671430 +1000 commit: second commit on master
|
||||
ced01df5f1a270490c1b9d4efe5ceb0c53626279 7bc178be031c4645110e9accb4accf16902d2d7f CI <CI@example.com> 1617671430 +1000 checkout: moving from master to develop
|
||||
7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI <CI@example.com> 1617671430 +1000 commit: third commit on develop
|
||||
6dfbfa4bd19cb38608681df40ebb3a78bd13a824 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI <CI@example.com> 1617671430 +1000 checkout: moving from develop to master
|
||||
ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI <CI@example.com> 1617671430 +1000 commit: third commit on master
|
||||
c9b473bec307b18fd94a913658f4d759be63ca47 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI <CI@example.com> 1617671430 +1000 checkout: moving from master to develop
|
||||
6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI <CI@example.com> 1617671430 +1000 commit: fourth commit on develop
|
||||
82db6d0e4502f489719ea0f3dbe7e14413c6d28a c9b473bec307b18fd94a913658f4d759be63ca47 CI <CI@example.com> 1617671430 +1000 checkout: moving from develop to master
|
||||
c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI <CI@example.com> 1617671430 +1000 commit: fourth commit on master
|
||||
279f068805e089660f7ddd17ff32f66100e0dca5 279f068805e089660f7ddd17ff32f66100e0dca5 CI <CI@example.com> 1617671430 +1000 checkout: moving from master to base_branch
|
||||
279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI <CI@example.com> 1617671430 +1000 commit: file
|
||||
08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI <CI@example.com> 1617671430 +1000 checkout: moving from base_branch to other_branch
|
||||
08e2576bb7cd0dd9be54f9a523c4bedea0643557 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI <CI@example.com> 1617671430 +1000 checkout: moving from other_branch to base_branch
|
||||
08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI <CI@example.com> 1617671430 +1000 commit: file changed
|
||||
4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI <CI@example.com> 1617671430 +1000 checkout: moving from base_branch to other_branch
|
||||
08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI <CI@example.com> 1617671431 +1000 commit: asd
|
||||
@@ -1,3 +0,0 @@
|
||||
0000000000000000000000000000000000000000 279f068805e089660f7ddd17ff32f66100e0dca5 CI <CI@example.com> 1617671430 +1000 branch: Created from HEAD
|
||||
279f068805e089660f7ddd17ff32f66100e0dca5 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI <CI@example.com> 1617671430 +1000 commit: file
|
||||
08e2576bb7cd0dd9be54f9a523c4bedea0643557 4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4 CI <CI@example.com> 1617671430 +1000 commit: file changed
|
||||
@@ -1,5 +0,0 @@
|
||||
0000000000000000000000000000000000000000 c50f7e1375a30118c2886d4b31318579f3419231 CI <CI@example.com> 1617671430 +1000 branch: Created from HEAD
|
||||
c50f7e1375a30118c2886d4b31318579f3419231 18c07ac9568c564ececb199f78f64babc92214cb CI <CI@example.com> 1617671430 +1000 commit: first commit on develop
|
||||
18c07ac9568c564ececb199f78f64babc92214cb 7bc178be031c4645110e9accb4accf16902d2d7f CI <CI@example.com> 1617671430 +1000 commit: second commit on develop
|
||||
7bc178be031c4645110e9accb4accf16902d2d7f 6dfbfa4bd19cb38608681df40ebb3a78bd13a824 CI <CI@example.com> 1617671430 +1000 commit: third commit on develop
|
||||
6dfbfa4bd19cb38608681df40ebb3a78bd13a824 82db6d0e4502f489719ea0f3dbe7e14413c6d28a CI <CI@example.com> 1617671430 +1000 commit: fourth commit on develop
|
||||
-9
@@ -1,9 +0,0 @@
|
||||
0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI <CI@example.com> 1617671430 +1000 branch: Created from HEAD
|
||||
31f2a971f823279ba1ef877be7599da288f6e24b 3d1213374cd86b841f034768571d0b5f2c870a16 CI <CI@example.com> 1617671430 +1000 commit: first commit freshman year
|
||||
3d1213374cd86b841f034768571d0b5f2c870a16 d25721fffa7dc911ff2a9102bef201db225e2f16 CI <CI@example.com> 1617671430 +1000 commit: second commit subway eat fresh
|
||||
d25721fffa7dc911ff2a9102bef201db225e2f16 dbf5ab9a4fa3f976d266f3be50670aa83121b420 CI <CI@example.com> 1617671430 +1000 commit: third commit fresh
|
||||
dbf5ab9a4fa3f976d266f3be50670aa83121b420 687ff9526e0d56fafe1445ee4c182a83afc3cc35 CI <CI@example.com> 1617671430 +1000 commit: fourth commit cool
|
||||
687ff9526e0d56fafe1445ee4c182a83afc3cc35 17dc45dd142947e06cf7e635d62f2c0acbb86da7 CI <CI@example.com> 1617671430 +1000 commit: fifth commit nice
|
||||
17dc45dd142947e06cf7e635d62f2c0acbb86da7 c27ef6b4964209a875191eca7e56605c8efa5eee CI <CI@example.com> 1617671430 +1000 commit: sixth commit haha
|
||||
c27ef6b4964209a875191eca7e56605c8efa5eee 5dc2e019349371e9b3e4f1be99754ba70094cad6 CI <CI@example.com> 1617671430 +1000 commit: seventh commit yeah
|
||||
5dc2e019349371e9b3e4f1be99754ba70094cad6 c50f7e1375a30118c2886d4b31318579f3419231 CI <CI@example.com> 1617671430 +1000 commit: eighth commit woo
|
||||
@@ -1,5 +0,0 @@
|
||||
0000000000000000000000000000000000000000 31f2a971f823279ba1ef877be7599da288f6e24b CI <CI@example.com> 1617671430 +1000 commit (initial): first commit
|
||||
31f2a971f823279ba1ef877be7599da288f6e24b 442a53c1b023b4816085fdc4eaa85d0c5fd897e2 CI <CI@example.com> 1617671430 +1000 commit: first commit on master
|
||||
442a53c1b023b4816085fdc4eaa85d0c5fd897e2 ced01df5f1a270490c1b9d4efe5ceb0c53626279 CI <CI@example.com> 1617671430 +1000 commit: second commit on master
|
||||
ced01df5f1a270490c1b9d4efe5ceb0c53626279 c9b473bec307b18fd94a913658f4d759be63ca47 CI <CI@example.com> 1617671430 +1000 commit: third commit on master
|
||||
c9b473bec307b18fd94a913658f4d759be63ca47 279f068805e089660f7ddd17ff32f66100e0dca5 CI <CI@example.com> 1617671430 +1000 commit: fourth commit on master
|
||||
-2
@@ -1,2 +0,0 @@
|
||||
0000000000000000000000000000000000000000 08e2576bb7cd0dd9be54f9a523c4bedea0643557 CI <CI@example.com> 1617671430 +1000 branch: Created from HEAD
|
||||
08e2576bb7cd0dd9be54f9a523c4bedea0643557 8cd762c119834784fdbf97e9bb3b4c15e804ebaa CI <CI@example.com> 1617671431 +1000 commit: asd
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-3
@@ -1,3 +0,0 @@
|
||||
x��A
|
||||
Β0E]η³$c�¤΅« c2™PΑ4%¦ΰρ-x·��ψ�k)ΟWΤ§ήDΐXφ �δΰΖΜa@Ξθ5iΔL#Ε,)ENj£&kΡz…�φΗ�‚¥€Ζ
c¶Ι!�3LΦ+ΪϋRL3ά¦ω! *ΫK.\Λ �;ο<Z£α�ZkuΠ#�Λ�s•λήϊ?
κ
|
||||
…ή‡ΎN¶A]
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-2
@@ -1,2 +0,0 @@
|
||||
xå�A
|
||||
Â0E]çÿAîTz�I34…˜)É´âíM‰K‘îý0 |>oñ\‡ãa¿ë83ÆBQÉ/h E Çœ }²Ìa¨ŸAsjAw¿ÞŒ¤ž1O’*Bǯ³Š|V¡'5ç–ßC/ƒ¹´ÀóÂQ&cý«Û¬5Éêx³ÜÏü›â7Ã0|Æ
|
||||
BIN
Binary file not shown.
-2
@@ -1,2 +0,0 @@
|
||||
x��K
|
||||
Т@ @]Я)Вdў���аU��ж N[к<О/ріё МqЉujр-�к&I�ФDe��ЩyЕJ�cЁ�1!�Цт5��7�Ї� � <вРNД ��шСОЭту`јн�Ы]зЎПЫ�ыњ�ЫИдИь0Ѓ�СТйYkЭA�Љ&ъFЇmo№Ћ`�Ёђ~Фц аб?
|
||||
-2
@@ -1,2 +0,0 @@
|
||||
x�ÎM
|
||||
Â0@a×9Å왤“L"BW=F2™Ø‚ý¡Dðøön ßâɶ,s㥠ªP-áʹgbîŦ‚RcÒ¬äU 9.êÌž]`¯ÎsÈ™¥`)1«§“{× e-š0Pç=›ôiÓvÀ0Â}ŸúMËþÖ›lËl° ØR‡pµˆhÎzN5ý“›:¿dJëK‹ùœ‘=
|
||||
-1
@@ -1 +0,0 @@
|
||||
xå�Ñ €0CývŠLÐ Å\ãj�VО´WÄí= Àü�„äãùM<†iìf.Œµ‚PUÊM¤HTá™3T¶`Q‘–¢9ƒ"×^òÂh‡d[éºóÓØËi+B�Ø;ç~¥/ Y :/–¸<PÃ
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
-2
@@ -1,2 +0,0 @@
|
||||
x�ŽA
|
||||
Â0E]ç³d’&“D„®<Æ$™PÁØR£èí
x·�ÿø/-µ^¤]ÛD #añÆ�×.±s]8›8rbÔ‘saP+oro�Œ—BѲ�Þé %±G„.�R؉ˆâg›—
¦ §ËYÞ\×› ÒRO Iûþg„½FDÕi�jòç\=äÕ[føyðžÕô,?w
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-3
@@ -1,3 +0,0 @@
|
||||
x�ŽM
|
||||
Â0F]ç³d¦I3D„®zŒüLh¡1%Dñø¼€›oñx¾XKY; „§ÞDÀ�.±'LžÉÇì8kÄ`Ðë`²F‡ZÐEµû&Ï "ñ5jŠÆš‘Åùƒ9&“u8¤!qVþÕ—Ú`šá6Íùø²or‰µÜ�,±e2áLˆ¨zœêò§®ú²¶¿
|
||||
ê’¼e«»ú�8@N
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
-3
@@ -1,3 +0,0 @@
|
||||
x�ŽA
|
||||
à E»ö³/'ŠN ”BV9†£#)$1ˆ)=~…^ ÛÿÞƒ ˶½ ˆ—VE@B°Å$뙘R¶žS ,É8â }Œ&©#TÙ¸”9Ë ÇȆœ&GØ -Ì&xêÀ¬
|
||||
g[J…i†û4?å¶c•[,ÛСw ÑpEµêk?ÕäO]årÖ¶À/ƒ²C’·¬åP_ÔTB
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-2
@@ -1,2 +0,0 @@
|
||||
x�ŽA
|
||||
Â0E]ç³d&M“D„®zŒÉtŠ‚iJÁãð.ÿç=þ—’ó³‚%<Õ]p�¤Q| èÙS >…ä ±kѦ¥“>ö³Ùx×µ‚s–ûN(¡í’‹ä1öË,N™…ÒB ‚ZÃïú(;Œ\Çé® ÎÛK/Rò
ÈShƒ®C8"šÖ¶SUÿÄÍ¡RÖ~”2 Í6_z1@
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-3
@@ -1,3 +0,0 @@
|
||||
x�ŽA
|
||||
Â0E]ç³dfÚ$D„®zŒdfBkKŒàñ-xwŸÇ{ðe]–{FhÕ ôœ¢xTI¹çÌ9°y‰QTL,0j7„>kï¶TíÙ@ÙG¦RJŠ*í‹Ó@ÈÙ
|
||||
#iföÆ…‚Kï6¯Æ .ãt³OZ¶‡�d]®@�bˆÔwGBD·ÓýT³?u×æ{UøUPª½f÷>‰?§
|
||||
-1
@@ -1 +0,0 @@
|
||||
xĺ�Ń €0Cýî™ ?Š3¸Ćµ V¨=iOÄí= Ŕü�„äă…,ý8tWĆÚ@h*ő‚&R$jĚ*y¶¨Ę‘s-Üś”Č8v)¶Ňu㧱—ÓV„HęĽ÷żŇ�"ťË
µćPż
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
@@ -1 +0,0 @@
|
||||
4e5d3ae0b6e865073bcbd79531a75c55bf7bfcb4
|
||||
@@ -1 +0,0 @@
|
||||
82db6d0e4502f489719ea0f3dbe7e14413c6d28a
|
||||
-1
@@ -1 +0,0 @@
|
||||
c50f7e1375a30118c2886d4b31318579f3419231
|
||||
@@ -1 +0,0 @@
|
||||
279f068805e089660f7ddd17ff32f66100e0dca5
|
||||
@@ -1 +0,0 @@
|
||||
8cd762c119834784fdbf97e9bb3b4c15e804ebaa
|
||||
@@ -1 +0,0 @@
|
||||
this is file number 1 that I'm going to cherry-pick
|
||||
@@ -1 +0,0 @@
|
||||
this is file number 2 that I'm going to cherry-pick
|
||||
@@ -1 +0,0 @@
|
||||
this is file number 3 that I'm going to cherry-pick
|
||||
@@ -1 +0,0 @@
|
||||
this is file number 4 that I'm going to cherry-pick
|
||||
@@ -1 +0,0 @@
|
||||
this is file number 5 that I'm going to cherry-pick
|
||||
@@ -1 +0,0 @@
|
||||
this is file number 6 that I'm going to cherry-pick
|
||||
@@ -1 +0,0 @@
|
||||
this is file number 7 that I'm going to cherry-pick
|
||||
@@ -1 +0,0 @@
|
||||
this is file number 8 that I'm going to cherry-pick
|
||||
@@ -1 +0,0 @@
|
||||
this is file number 9 that I'm going to cherry-pick
|
||||
@@ -1,5 +0,0 @@
|
||||
<<<<<<< HEAD
|
||||
test3
|
||||
=======
|
||||
test2
|
||||
>>>>>>> develop
|
||||
@@ -1,5 +0,0 @@
|
||||
<<<<<<< HEAD
|
||||
test3
|
||||
=======
|
||||
test2
|
||||
>>>>>>> develop
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user