From 2295407a450e296625942dd87779a58ae7acdee7 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Mon, 5 Apr 2021 10:44:04 +1000
Subject: [PATCH] update discard file changes test

---
 .../expected/.git_keep/COMMIT_EDITMSG         |  24 +++++++++++++++++-
 .../expected/.git_keep/MERGE_HEAD             |   1 -
 .../expected/.git_keep/MERGE_MODE             |   0
 .../expected/.git_keep/MERGE_MSG              |  10 --------
 .../expected/.git_keep/ORIG_HEAD              |   2 +-
 .../expected/.git_keep/index                  | Bin 1504 -> 1524 bytes
 .../expected/.git_keep/logs/HEAD              |  15 ++++++-----
 .../.git_keep/logs/refs/heads/conflict        |   6 ++---
 .../.git_keep/logs/refs/heads/conflict_second |   7 ++---
 .../07/76b49486a00aecd966e4d72e14edea5fad91a8 | Bin 0 -> 182 bytes
 .../0e/5c9fd43732ca064946e9c582fd6f159774db84 |   2 --
 .../32/47afc767cff1c98fe5277005f6653547b20fa4 |   2 ++
 .../36/33f8c997d88e0c59202f498c8344da9da3aaf4 |   2 ++
 .../38/b645bf2388b21695d22d7f673d87971a78e4ad | Bin 146 -> 0 bytes
 .../39/d62c8a07e5103fef16c32373738ce92c4549b7 | Bin 0 -> 203 bytes
 .../45/9fa5065afddb89a3dccddef39b17b5fd74d041 |   3 +++
 .../69/8e214196fed018bb4164380745dd2df3bbac74 | Bin 180 -> 0 bytes
 .../83/7fbbc4ee6892b828a4a94be22c39814146aafb | Bin 0 -> 147 bytes
 .../c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb |   2 --
 .../eb/4814e3f9d5eb1869704cf4498420c9f4a141da |   1 -
 .../expected/.git_keep/refs/heads/conflict    |   2 +-
 .../.git_keep/refs/heads/conflict_second      |   2 +-
 .../discardFileChanges/recording.json         |   2 +-
 test/integration/discardFileChanges/test.json |   2 +-
 24 files changed, 50 insertions(+), 35 deletions(-)
 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD
 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE
 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG
 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8
 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84
 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4
 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4
 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad
 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/39/d62c8a07e5103fef16c32373738ce92c4549b7
 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041
 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74
 create mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb
 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb
 delete mode 100644 test/integration/discardFileChanges/expected/.git_keep/objects/eb/4814e3f9d5eb1869704cf4498420c9f4a141da

diff --git a/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG b/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG
index 2bdf67abb..552587d35 100644
--- a/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG
+++ b/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG
@@ -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.
+#
diff --git a/test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD b/test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD
deleted file mode 100644
index 6d6a6623d..000000000
--- a/test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD
+++ /dev/null
@@ -1 +0,0 @@
-38b645bf2388b21695d22d7f673d87971a78e4ad
diff --git a/test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE b/test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG b/test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG
deleted file mode 100644
index d6189997a..000000000
--- a/test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG
+++ /dev/null
@@ -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
diff --git a/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD b/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD
index 07e446d60..79f1c70e0 100644
--- a/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD
+++ b/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD
@@ -1 +1 @@
-c64dd6aea3efd197ed630dedc1ffb538d35c3fdb
+3633f8c997d88e0c59202f498c8344da9da3aaf4
diff --git a/test/integration/discardFileChanges/expected/.git_keep/index b/test/integration/discardFileChanges/expected/.git_keep/index
index 68453567499898accafe934dbf1f3db0962f01cb..d2ec8aba0496e7d93d999b93a934ff881525310b 100644
GIT binary patch
delta 408
zcmaFB{e@e_#WTp6fq{Vuh<OsSBDM96RcFI!Mg|5JHjSl;6ICq5vm$j31ces@rNA^)
zDt%%JNXp3c@}@aJDKHI{DxY`+B&Es1c+40m1*V}=(vw9P9f5MjhB?!efpTCPDpxf*
zhY_UDM1SoxSD+l2hRW4V-UHUB$++w14v?838X~vk^<)tykUmrGTm0*Ra$p*&uMwzE
zb#f<@2vFWk<6~$iP##P}<y$6i0qZqa6AhLI%7JO9T>E4eW{|lS3NOM=1LeRpRIYn+
z2w2XV|F}jCP!3E(<@zTtVYZi+VlXsPFyM+jUtO_&*6Nl<>(ksP_No89shF+3`4#gc
cMv=GeANTC-w7x2sDf320^3r~hZPRW80DKO9!vFvP

delta 388
zcmeyu{eWA=#WTp6fq{Vuh<Or1eRWwkRs_RnMg|5JHi20Ai7J-jKq)1!|6nB`8Y-na
zu>>q-D0;06qzgntr8FlV0ZHjF*>4aBN`YyJRLtASB8-keIX!`u=^Q{gFb&nFH#vt9
zq)$(-zNrx;2cn^JhLiVz^=Vsouy6zAz%<m%y^}?lK>GA~a#SRNa$p*&&m5>vb#f<@
z2uNOP{cLxTJcx$MTTR{q(W~(_m=7ceqM>rOlUbO-=9+z+AqA2H(NH=2$su4l1M$j)
z??5>)4V81AyoA}FosB`)P{Dv}^FQWCj3TdR+?TPRKD{u-U)b;UgYIeDi)Ew%B!gtE

diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD b/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD
index 84066dbf1..ea46cdc88 100644
--- a/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD
+++ b/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD
@@ -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
diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict
index 4827c7871..692e2161e 100644
--- a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict
+++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict
@@ -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
diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second
index 0e1748048..b0bd0abaa 100644
--- a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second
+++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second
@@ -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
diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 b/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8
new file mode 100644
index 0000000000000000000000000000000000000000..d3e23bef3a23e6e1d357b876d33966f0c50a3e47
GIT binary patch
literal 182
zcmV;n07?IN0gcX0io-ArhT*P#3hjp!Iq^>nWf<tH$B-?#Dbz_xRp{}@y+N1X$GdpS
z*4j;Bba>ER1d0gGnQ{r)Vyb9ub)!%wUt^LWAx#C7MDw6sRt4u%C6B>VWzKV=iA!OY
zI;Cu5_LZY!bk@*Imu-jh1y1M7pS-C(?s6<!`vn_p^z%5y06!KHO@BK|<;&dUO_zb?
kE-HM~w?d~;6NcLg)G<8hB5f!Ot=B$Y&rf9j0WoDv_~#*5SpWb4

literal 0
HcmV?d00001

diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84 b/test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84
deleted file mode 100644
index 3ad31c1dc..000000000
--- a/test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��A
-�@@Q�s����cR���U����)x|{�n?~���P�K�ܡG�tO�K�̔ʔ�kv�Et��W�`�a�������Z@B��㍠#BG=&�O�P��I�*�
\ No newline at end of file
diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4 b/test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4
new file mode 100644
index 000000000..db0d71d86
--- /dev/null
+++ b/test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4
@@ -0,0 +1,2 @@
+x
��͊�0�q�y��*I�Հ�|�$��
+��z��=�9����Mht� ;@H�3�F�c��iv�Ą�"�TƤG�z����i�^�g�2�l�Vf�6��9:�Ψ��e��|����wn�;�uk�d��~ꯑ~��Z���_�l��;|��P����Ju��<Ȃ6�.����D���K`
\ No newline at end of file
diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4 b/test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4
new file mode 100644
index 000000000..eb8cc0bf7
--- /dev/null
+++ b/test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4
@@ -0,0 +1,2 @@
+x
��M
+�0@a�9E�����1f�3([J�o������?��-��.bsc������#19�J@��_(��p���1$@e(���[U�
�����Pp���g<��N��N�]�ط�\x�7닇\C�g�3G=PC���xt���:L
\ No newline at end of file
diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad b/test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad
deleted file mode 100644
index 45642dcb1ef75a84165dbe1774906cf9165886cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 146
zcmV;D0B!$x0gaA93c@fD06pgwxeKz}Y~wD72tD-~$!3d!F{MQG`SuB3<}l1*wAK3P
z9t944GxMlI%oz+br(DpKBaJzP9VMyYAdo4NThnH*?ky7|Sy-fumXV{Jfpj4frU6tI
zN=R6eOYeSfo1bQXndX~)Q(d2S(pIk?BgO#&jOdSu0B*PYRJT8K*FVku0M>dqlk5RQ
AbN~PV

diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/39/d62c8a07e5103fef16c32373738ce92c4549b7 b/test/integration/discardFileChanges/expected/.git_keep/objects/39/d62c8a07e5103fef16c32373738ce92c4549b7
new file mode 100644
index 0000000000000000000000000000000000000000..fc8fb22d3d53400ad1a3963cdd5d2f1fcf635958
GIT binary patch
literal 203
zcmV;+05t!20gaEnYQsPfgj3&BZ08~n?oYa12qECgMV=w-?(M|_OESs@^7y&NeY*LE
zkAcyBU6&5A&{IFmU?Ocr3UVW6!Hgk^iWfz(SX!+V!z@wUoe$eOq&cOAN>nPMd7UWw
z*fODF%DFOCPRuPod`zW@Xf~UXqF_YMOnHn)O@twbJP%(S|McsA!1)5N=gYhO@_N77
zi|*?iggKN6W1<4j!F%sUJ5F@_r|v%N_%e`#H@(71_pRL)?I&2azQY4Qziq_o{s4=#
FR=U<@XS4tS

literal 0
HcmV?d00001

diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041 b/test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041
new file mode 100644
index 000000000..707cdfc06
--- /dev/null
+++ b/test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041
@@ -0,0 +1,3 @@
+x
���
+�0�a�}��I��T�1�i���kǨ��G�����[����ww5�2�Z���J��bt-n����`��h;���e������$��ă
+�	�Q�I�?yho?P*�
\ No newline at end of file
diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74 b/test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74
deleted file mode 100644
index de9f05a03a9b74decf43662a65e0cf3a1c3e8314..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmV;l089UP0gaA9YQr!PMZ4B1W?vj6c_dj-N+GKpL)LuPfyfT-1akZ;H^}bsc#Bu}
z)~-sP?S~!!A%`G{7HRZxWVXUFIHZis33Zx%wth^bxt9Z*l0~R_5$?*@Vk2jc$TduU
zk+`^!Q(~DXHszt~e$e?sU+2pYo~7MyIMuy<lZ!5TJKEsr(>ZHRw|z?SW^U$P*FkWD
iLQeWr>T9Jz=(<r|%k~QybVVDANXN(DD>DE40!jRW`C3o_

diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb b/test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb
new file mode 100644
index 0000000000000000000000000000000000000000..63bd1c8d9c6095ca305b2f7cbcd79fc4c4c04767
GIT binary patch
literal 147
zcmV;E0Brww0gaA93IZ_<MP2t4*$a|%I%x|c!mQ>PX&X_nb{Hype0u~pfAM$^er~ls
zI#9$z-&KKfbRi^EN<mT~&4JyVrfE!(9LYvZj-A<L*H;Jho|7953!-Q)ky%~wR>^5m
znQu}eNig#6_qM~b!g*P*`jxsp^^{w^05SPF*vT^-2@%bp<5br_b<;o1`~VM`IZ3T7
BLEZoW

literal 0
HcmV?d00001

diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb b/test/integration/discardFileChanges/expected/.git_keep/objects/c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb
deleted file mode 100644
index 5da5ff4bc..000000000
--- a/test/integration/discardFileChanges/expected/.git_keep/objects/c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��A
-�0@Q�9E���L�d"BW=F&��`l)<�=���_�����Ʈj�TZ�ȹ���=��" �E)�Za��]�Æ�J�1���E<���j�ڜH.ћ��u��b��r�o��K/e�7�
������@
�s7�q���':G
\ No newline at end of file
diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/eb/4814e3f9d5eb1869704cf4498420c9f4a141da b/test/integration/discardFileChanges/expected/.git_keep/objects/eb/4814e3f9d5eb1869704cf4498420c9f4a141da
deleted file mode 100644
index 1d1e8b355..000000000
--- a/test/integration/discardFileChanges/expected/.git_keep/objects/eb/4814e3f9d5eb1869704cf4498420c9f4a141da
+++ /dev/null
@@ -1 +0,0 @@
-x
��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;�/�u���)�~él��l�����ҧ���ǔ����M���E=�S�X��Jו�V�A��,����{E�VJK�
\ No newline at end of file
diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict
index 6d6a6623d..4a6184f26 100644
--- a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict
+++ b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict
@@ -1 +1 @@
-38b645bf2388b21695d22d7f673d87971a78e4ad
+837fbbc4ee6892b828a4a94be22c39814146aafb
diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second
index 07e446d60..79ace5379 100644
--- a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second
+++ b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second
@@ -1 +1 @@
-c64dd6aea3efd197ed630dedc1ffb538d35c3fdb
+39d62c8a07e5103fef16c32373738ce92c4549b7
diff --git a/test/integration/discardFileChanges/recording.json b/test/integration/discardFileChanges/recording.json
index f5f9dbc7a..4b64e16f0 100644
--- a/test/integration/discardFileChanges/recording.json
+++ b/test/integration/discardFileChanges/recording.json
@@ -1 +1 @@
-[{"Timestamp":23,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":377,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":481,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":593,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":713,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":816,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":952,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1057,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1185,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1305,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1425,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1537,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1673,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1760,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1897,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1992,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":2129,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2225,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":2361,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2473,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":2592,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2705,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":2825,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2937,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":3065,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3185,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":3297,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3409,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":3537,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3641,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":3777,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3873,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":4008,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4121,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":4233,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4345,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":4449,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4751,"Event":{"Type":0,"Mod":0,"Key":27,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Gw=="}}]
\ No newline at end of file
+{"KeyEvents":[{"Timestamp":966,"Mod":0,"Key":256,"Ch":100},{"Timestamp":1564,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2093,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2621,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3173,"Mod":0,"Key":256,"Ch":100},{"Timestamp":3652,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4165,"Mod":0,"Key":256,"Ch":100},{"Timestamp":4629,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5190,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5686,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6198,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6733,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7254,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7789,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8285,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8773,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9237,"Mod":0,"Key":256,"Ch":100},{"Timestamp":9725,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10181,"Mod":0,"Key":256,"Ch":100},{"Timestamp":10653,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11125,"Mod":0,"Key":256,"Ch":100},{"Timestamp":11621,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12093,"Mod":0,"Key":256,"Ch":100},{"Timestamp":12565,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13037,"Mod":0,"Key":256,"Ch":100},{"Timestamp":13509,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13965,"Mod":0,"Key":256,"Ch":100},{"Timestamp":14461,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14909,"Mod":0,"Key":256,"Ch":100},{"Timestamp":15382,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15853,"Mod":0,"Key":256,"Ch":100},{"Timestamp":16325,"Mod":0,"Key":13,"Ch":13},{"Timestamp":16765,"Mod":0,"Key":256,"Ch":100},{"Timestamp":17222,"Mod":0,"Key":13,"Ch":13},{"Timestamp":17637,"Mod":0,"Key":256,"Ch":100},{"Timestamp":18077,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20190,"Mod":0,"Key":256,"Ch":109},{"Timestamp":20447,"Mod":0,"Key":13,"Ch":13},{"Timestamp":21414,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":23}]}
\ No newline at end of file
diff --git a/test/integration/discardFileChanges/test.json b/test/integration/discardFileChanges/test.json
index 7a06a6c50..9c2851120 100644
--- a/test/integration/discardFileChanges/test.json
+++ b/test/integration/discardFileChanges/test.json
@@ -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 }