show only merge conflict files when there are merge conflicts

test/integration/branchRebase/expected/.git_keep/COMMIT_EDITMSG

@@ -3,15 +3,16 @@ first commit on master
 # Please enter the commit message for your changes. Lines starting
 # with '#' will be ignored, and an empty message aborts the commit.
 #
-# interactive rebase in progress; onto e23041d
+# interactive rebase in progress; onto e957aaf
 # Last command done (1 command done):
-#    pick 5bc64a0 first commit on master
+#    pick 69f11ae first commit on master
 # Next commands to do (3 remaining commands):
-#    drop 8c464cc second commit on master
-#    drop 9ec3d8f third commit on master
-# You are currently rebasing branch 'master' on 'e23041d'.
+#    drop 8d3bd1c second commit on master
+#    drop 3e1706c third commit on master
+# You are currently rebasing branch 'master' on 'e957aaf'.
 #
 # Changes to be committed:
+#	modified:   directory/file
 #	modified:   directory/file2
 #	modified:   file1
 #

test/integration/branchRebase/expected/.git_keep/ORIG_HEAD

@@ -1 +1 @@
-5bc64a01e7b980e97f714fba45aa18f0eef726fb
+69f11ae88c8712fe38ffd0fe9ff9df05371500a6

test/integration/branchRebase/expected/.git_keep/logs/HEAD

@@ -1,22 +1,22 @@
-0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI <CI@example.com> 1617686669 +1000	commit (initial): first commit
-ad12d265183742f1aa5ee2fe7c09dc3c16482d7d ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI <CI@example.com> 1617686669 +1000	checkout: moving from master to develop
-ad12d265183742f1aa5ee2fe7c09dc3c16482d7d f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI <CI@example.com> 1617686669 +1000	commit: first commit on develop
-f3dedf7d7a26a03a4e996a1d8e9bf2754609717f ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI <CI@example.com> 1617686669 +1000	checkout: moving from develop to master
-ad12d265183742f1aa5ee2fe7c09dc3c16482d7d 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI <CI@example.com> 1617686669 +1000	commit: first commit on master
-5bc64a01e7b980e97f714fba45aa18f0eef726fb f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI <CI@example.com> 1617686669 +1000	checkout: moving from master to develop
-f3dedf7d7a26a03a4e996a1d8e9bf2754609717f f9ad2a0d946867abbd3228fc132afef480287c27 CI <CI@example.com> 1617686669 +1000	commit: second commit on develop
-f9ad2a0d946867abbd3228fc132afef480287c27 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI <CI@example.com> 1617686669 +1000	checkout: moving from develop to master
-5bc64a01e7b980e97f714fba45aa18f0eef726fb 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI <CI@example.com> 1617686669 +1000	commit: second commit on master
-8c464cc13c9ad8d00604ec9b646e2b2187706287 f9ad2a0d946867abbd3228fc132afef480287c27 CI <CI@example.com> 1617686669 +1000	checkout: moving from master to develop
-f9ad2a0d946867abbd3228fc132afef480287c27 7f8238e605705a3b485f653df7779e43a41f4e76 CI <CI@example.com> 1617686669 +1000	commit: third commit on develop
-7f8238e605705a3b485f653df7779e43a41f4e76 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI <CI@example.com> 1617686669 +1000	checkout: moving from develop to master
-8c464cc13c9ad8d00604ec9b646e2b2187706287 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI <CI@example.com> 1617686669 +1000	commit: third commit on master
-9ec3d8f323be49b6cc9036db9299fb0ae6764440 7f8238e605705a3b485f653df7779e43a41f4e76 CI <CI@example.com> 1617686669 +1000	checkout: moving from master to develop
-7f8238e605705a3b485f653df7779e43a41f4e76 e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI <CI@example.com> 1617686669 +1000	commit: fourth commit on develop
-e23041d5ff1f243faf319cc5e48e6d57384e4f37 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI <CI@example.com> 1617686669 +1000	checkout: moving from develop to master
-9ec3d8f323be49b6cc9036db9299fb0ae6764440 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI <CI@example.com> 1617686669 +1000	commit: fourth commit on master
-4d34b8913eb0991ca63f8f7877ab8408e1511b3d e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI <CI@example.com> 1617686671 +1000	rebase -i (start): checkout develop
-e23041d5ff1f243faf319cc5e48e6d57384e4f37 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI <CI@example.com> 1617686672 +1000	rebase -i (abort): updating HEAD
-4d34b8913eb0991ca63f8f7877ab8408e1511b3d e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI <CI@example.com> 1617686674 +1000	rebase -i (start): checkout develop
-e23041d5ff1f243faf319cc5e48e6d57384e4f37 cea4333c6fff70e6248efee2b3a414a4e11a7956 CI <CI@example.com> 1617686684 +1000	rebase -i (continue): first commit on master
-cea4333c6fff70e6248efee2b3a414a4e11a7956 cea4333c6fff70e6248efee2b3a414a4e11a7956 CI <CI@example.com> 1617686684 +1000	rebase -i (finish): returning to refs/heads/master
+0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI <CI@example.com> 1643188754 +1100	commit (initial): first commit
+3627f93f3cc779dc2f99484fb8ffa49953e43b2f 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI <CI@example.com> 1643188754 +1100	checkout: moving from master to develop
+3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI <CI@example.com> 1643188754 +1100	commit: first commit on develop
+9a6521a3788b4d9e679b1709130ff8dc3f73ab18 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI <CI@example.com> 1643188754 +1100	checkout: moving from develop to master
+3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI <CI@example.com> 1643188754 +1100	commit: first commit on master
+69f11ae88c8712fe38ffd0fe9ff9df05371500a6 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI <CI@example.com> 1643188754 +1100	checkout: moving from master to develop
+9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI <CI@example.com> 1643188754 +1100	commit: second commit on develop
+a8381c9130b03aef530b60b5a4546b93dc59ae12 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI <CI@example.com> 1643188754 +1100	checkout: moving from develop to master
+69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI <CI@example.com> 1643188754 +1100	commit: second commit on master
+8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI <CI@example.com> 1643188754 +1100	checkout: moving from master to develop
+a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI <CI@example.com> 1643188754 +1100	commit: third commit on develop
+7095508e3cd0fd40572f8e711170db38ef2342d7 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI <CI@example.com> 1643188754 +1100	checkout: moving from develop to master
+8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI <CI@example.com> 1643188754 +1100	commit: third commit on master
+3e1706cdf670f5641be0715178471abfc9ed1748 7095508e3cd0fd40572f8e711170db38ef2342d7 CI <CI@example.com> 1643188754 +1100	checkout: moving from master to develop
+7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI <CI@example.com> 1643188754 +1100	commit: fourth commit on develop
+e957aaf2eef0c03a9052b472d4862d9ee684c3e5 3e1706cdf670f5641be0715178471abfc9ed1748 CI <CI@example.com> 1643188754 +1100	checkout: moving from develop to master
+3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI <CI@example.com> 1643188754 +1100	commit: fourth commit on master
+f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI <CI@example.com> 1643188756 +1100	rebase -i (start): checkout develop
+e957aaf2eef0c03a9052b472d4862d9ee684c3e5 f5067da83b48f8588edce682fd2715a575f34373 CI <CI@example.com> 1643188757 +1100	rebase -i (abort): updating HEAD
+f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI <CI@example.com> 1643188758 +1100	rebase -i (start): checkout develop
+e957aaf2eef0c03a9052b472d4862d9ee684c3e5 42597904331c82f6d5c8c902755c8dfa5767ea95 CI <CI@example.com> 1643188766 +1100	rebase -i (continue): first commit on master
+42597904331c82f6d5c8c902755c8dfa5767ea95 42597904331c82f6d5c8c902755c8dfa5767ea95 CI <CI@example.com> 1643188766 +1100	rebase -i (finish): returning to refs/heads/master

test/integration/branchRebase/expected/.git_keep/logs/refs/heads/develop

@@ -1,5 +1,5 @@
-0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI <CI@example.com> 1617686669 +1000	branch: Created from HEAD
-ad12d265183742f1aa5ee2fe7c09dc3c16482d7d f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI <CI@example.com> 1617686669 +1000	commit: first commit on develop
-f3dedf7d7a26a03a4e996a1d8e9bf2754609717f f9ad2a0d946867abbd3228fc132afef480287c27 CI <CI@example.com> 1617686669 +1000	commit: second commit on develop
-f9ad2a0d946867abbd3228fc132afef480287c27 7f8238e605705a3b485f653df7779e43a41f4e76 CI <CI@example.com> 1617686669 +1000	commit: third commit on develop
-7f8238e605705a3b485f653df7779e43a41f4e76 e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI <CI@example.com> 1617686669 +1000	commit: fourth commit on develop
+0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI <CI@example.com> 1643188754 +1100	branch: Created from HEAD
+3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI <CI@example.com> 1643188754 +1100	commit: first commit on develop
+9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI <CI@example.com> 1643188754 +1100	commit: second commit on develop
+a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI <CI@example.com> 1643188754 +1100	commit: third commit on develop
+7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI <CI@example.com> 1643188754 +1100	commit: fourth commit on develop

test/integration/branchRebase/expected/.git_keep/logs/refs/heads/master

@@ -1,6 +1,6 @@
-0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI <CI@example.com> 1617686669 +1000	commit (initial): first commit
-ad12d265183742f1aa5ee2fe7c09dc3c16482d7d 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI <CI@example.com> 1617686669 +1000	commit: first commit on master
-5bc64a01e7b980e97f714fba45aa18f0eef726fb 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI <CI@example.com> 1617686669 +1000	commit: second commit on master
-8c464cc13c9ad8d00604ec9b646e2b2187706287 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI <CI@example.com> 1617686669 +1000	commit: third commit on master
-9ec3d8f323be49b6cc9036db9299fb0ae6764440 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI <CI@example.com> 1617686669 +1000	commit: fourth commit on master
-4d34b8913eb0991ca63f8f7877ab8408e1511b3d cea4333c6fff70e6248efee2b3a414a4e11a7956 CI <CI@example.com> 1617686684 +1000	rebase -i (finish): refs/heads/master onto e23041d5ff1f243faf319cc5e48e6d57384e4f37
+0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI <CI@example.com> 1643188754 +1100	commit (initial): first commit
+3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI <CI@example.com> 1643188754 +1100	commit: first commit on master
+69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI <CI@example.com> 1643188754 +1100	commit: second commit on master
+8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI <CI@example.com> 1643188754 +1100	commit: third commit on master
+3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI <CI@example.com> 1643188754 +1100	commit: fourth commit on master
+f5067da83b48f8588edce682fd2715a575f34373 42597904331c82f6d5c8c902755c8dfa5767ea95 CI <CI@example.com> 1643188766 +1100	rebase -i (finish): refs/heads/master onto e957aaf2eef0c03a9052b472d4862d9ee684c3e5

test/integration/branchRebase/expected/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748

@@ -0,0 +1,2 @@
+x
<01>ÎA
+Â0…a×9ÅìIšI2
¡«c’LiÁ˜R#x|^ÀíãÿàåVëÚaÐñÔwL žƒÓ6ZòÞPû˜ÒÌHV<48>gµñ.ÏTl*&§âœ×9¸˜‘RÖe@Î)æ™%XÅï¾´Æ	®ãt—×í!—Üê
ŒGkˆ‚C8£µ:ÖãT—?sÕ—u/ðSОPùu`õ.°?í

test/integration/branchRebase/expected/.git_keep/objects/4d/34b8913eb0991ca63f8f7877ab8408e1511b3d

@@ -1,2 +0,0 @@
-x
ŤŽA
-Â0E]çłdŇÄiD„®zŚd2ˇ‚iJMÁă[đn˙ńźÔRž
:‹§¶©‚óŇ{KV53
Yřj%ŰZ›ĂbÖ”˘$ł†M—¬âŇ<C3A2>]ç˘zŽ$Âč(Eî<45>sÄ Ô“÷MŘŰ\7'¸ŤÓC?ˇ¬/˝H-w8îz<1A><>álŃô<>júçÜäşom†źu<>އmľ\ÁA‚

test/integration/branchRebase/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b2187706287

@@ -1,2 +0,0 @@
-x
<01>ŽA
-Â0E]ç³d¦¦3)ˆ]õ“8AÁ4¥<34>àñ-x
—ÿñüTKy6èm5R´<52>XH²2á(‘=©ßgó9õ¡¿»EW›ô1±W$“8´A²<41>ÏQ}¯J!£Y–Žstún<C3BA>ºÂ8ÁeœnöѲ¼ì”j¹1	fàHˆèvºŸjö§î6Ku¾Ã/ƒ:CÑm¯ÝÙí@Ó

test/integration/branchRebase/expected/.git_keep/objects/8d/3bd1cbd5560c759c78a948bc0d24acb9cfae73

@@ -0,0 +1,2 @@
+x
<01><>M
+Β0F]η³d¦ΝΟD„®z<C2AE>$<24>AΑ4¥<34>ΰρ-x
—ίγ=ψr-εΩ #<µMpΘI8ϋ@!£<><C2A3>8ψ’·ν1»¤}vμf³ΖM–~PΆ(Μ™u*=«Ξ¨2¨³Άλ9ΔθM|·Gέ`<60>ΰ:NwωΔ²Ύδ’kΉ
yΫspΞD<CE9E>ζ Η©&κf—\—~ΤJά<4A>Ϊ|
µB@t

test/integration/branchRebase/expected/.git_keep/objects/9a/6521a3788b4d9e679b1709130ff8dc3f73ab18

@@ -0,0 +1,3 @@
+x
<01><>K
+Â0@]糤ù´“
¡«#“Î`¡mJ<6D>âñ-x
·<>÷àå²,Sg›SİE@%8äÖ1³Ğ˜r´:ŸlçÔcbBÊ	ѱÙÒ.kß9TòêsF¤1;%
+1(GÕˆZ/Á³S“^õQvè¸öÃ]>iÙf¹ä²ÜÀvÁÛ±
p¶¶iÌA<C38C>©*êF§ıYáWAYa”·Ìe3_-MA"

test/integration/branchRebase/expected/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12

@@ -0,0 +1,2 @@
+x
<01>ŽË
+Â0E]ç+f/H&“ÇD„®úyLQ°M©Qü|þ€pW‡sà–6Ï÷ñÐ7ɺ̑ˆ4‹¥É¸D\5Q³7i_ÌÖgRkÚdé“wælkbÆ #’ž&®…¦@)#«ôê·¶Á0Ây¯òIóú<C3B3>SióÐ[Bæà,µV;ÝOuùSWO)m©ðË -På-<2D>¶ª/8|?¼

test/integration/branchRebase/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4

@@ -1,2 +0,0 @@
-x
å<>Á
-Â0D=ç+抈íIA¡¿±I×6Ðd%ÙRü{SêYêÙ<C3AA>eaw˜<77>gG±¨›Ã®åÄð„¬’^Ð<>eX敱+§$ÓЗ͠ž³9­B{¿ÞŒDǘžK„úÀ‹­DÎ%‚ÐIoΫ¾©¹¬Bm]s¤}UUxø”NBðŠR(+'S^5›<35>GYèoÆþ±ÿÿ
¾(<28>!

test/integration/branchRebase/expected/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f

@@ -0,0 +1,6 @@
+x
ĺ<>Q
+Â@DýŢSĚ	
+,*
+˝FÚ¦íBw#»)âíM©ßRż<08>d<EFBFBD><64>×LŇŕPíw5'†Ď d•ô‚Ž¤)ŁaŽP™:;%™ÇÁ6<C381>Îî´
+őýzs[Ćü<C486>hę/6‹|Zˇ“ÁťW}7¶¤î˛
+Ő±/Kâ˘(Đű”­„ŕV(+'gŻżšÍŔŁ,ô7c˙Ř<C598>˙Ę0Ť1

test/integration/branchRebase/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956

@@ -1,3 +0,0 @@
-x
}ЋН
-В0„=ч)ц.H’Н/€=х1’t¦)mЯЂћenГч
“k)K%В©нDђD››мaТЙGБ!ёЊJ*Н=В1lq§µ
)ZО†YІТИ‘Q†њ
iOv6Ѕ&Ни†шjЏєГ8БuњофЋe{Т%ЧriҐіЮZа,EЯоm?Хи?охxЩЏ_к
-%]>:‡?ї

test/integration/branchRebase/expected/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373

@@ -0,0 +1,4 @@
+x
<01>ŽA
+Â0E]ç³$c“L
+"BW=FšÌPÁ4%¦àñ
x
·ÿ½?–œŸ
®¨O­2Ã`"tÈ,£óG‹Q<E280B9>tЈ|X„SZbR{¨¼5¸C“8Òb<C392>Á…5¡Eò†°Ûqä„d¼
+G[K…i†Û4?øòþâK,ùèÌ€Þ“5pFÔZõµŸjü§®¤µ­ðË l<C2A0>û×ê1A

test/integration/branchRebase/expected/.git_keep/objects/f9/ad2a0d946867abbd3228fc132afef480287c27

@@ -1,2 +0,0 @@
-x
<01><>M
-Β0F]η³$Ώ“<0C>]υ“f‚‚mJ<6D>βρ-x
α[=ήƒojσ|ο`<60>9τM"ϋ<>9ηtο<>
EB±¤ZήGΩcvjεM–Υ)5–ΘY;φB„lJΚΥΖΰQS4±*~υ[Ϋ`α<<3C>WωπΌ>δ4µωMΔ„<CE94>G£µV;έOuωSWO™ΪRΰ—A[ Θ[mU_ .@a

test/integration/branchRebase/expected/.git_keep/refs/heads/develop

@@ -1 +1 @@
-e23041d5ff1f243faf319cc5e48e6d57384e4f37
+e957aaf2eef0c03a9052b472d4862d9ee684c3e5

test/integration/branchRebase/expected/.git_keep/refs/heads/master

@@ -1 +1 @@
-cea4333c6fff70e6248efee2b3a414a4e11a7956
+42597904331c82f6d5c8c902755c8dfa5767ea95

test/integration/branchRebase/expected/directory/file

@@ -1 +1 @@
-test2
+test3

test/integration/branchRebase/expected/file1

@@ -60,4 +60,4 @@ once upon a time there was a cat
 ...
 ...
 ...
-once upon a time there was another cat
+once upon a time there was another dog

test/integration/branchRebase/recording.json

@@ -1 +1 @@
-{"KeyEvents":[{"Timestamp":468,"Mod":0,"Key":259,"Ch":0},{"Timestamp":860,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1196,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1869,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2984,"Mod":0,"Key":27,"Ch":0},{"Timestamp":4124,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4764,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5756,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6308,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6572,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7204,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7468,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7668,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8492,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8604,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8957,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9132,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9556,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10067,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10692,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10989,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11164,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11596,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11996,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12493,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12757,"Mod":0,"Key":257,"Ch":0},{"Timestamp":12900,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13245,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13380,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13788,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14516,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15604,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
+{"KeyEvents":[{"Timestamp":617,"Mod":0,"Key":259,"Ch":0},{"Timestamp":922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1176,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1512,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2797,"Mod":0,"Key":27,"Ch":0},{"Timestamp":3632,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4760,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5105,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5376,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5721,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5992,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6186,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6401,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6592,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6840,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7105,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7612,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8160,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8680,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9080,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9464,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9808,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10040,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10372,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11249,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12088,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/mergeConflictsFiltered/config/config.yml

@@ -0,0 +1,5 @@
+disableStartupPopups: true
+gui:
+  showFileTree: false
+refresher:
+  refreshInterval: 1

test/integration/mergeConflictsFiltered/expected/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1,40 @@
+Merge branch 'develop' into other_branch
+
+# Conflicts:
+#	directory/file
+#	directory/file2
+#	file1
+#	file3
+#	file4
+#	file5
+#
+# 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/mergeConflictsFiltered/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 other_branch
+# All conflicts fixed but you are still merging.
+#
+# Changes to be committed:
+#	new file:   cherrypicking1
+#	new file:   cherrypicking2
+#	new file:   cherrypicking3
+#	new file:   cherrypicking4
+#	new file:   cherrypicking5
+#	new file:   cherrypicking7
+#	new file:   cherrypicking8
+#	new file:   cherrypicking9
+#	modified:   directory/file
+#	modified:   directory/file2
+#	modified:   file1
+#	modified:   file4
+#	modified:   file5
+#
+# Untracked files:
+#	cherrypicking6
+#

test/integration/mergeConflictsFiltered/expected/.git_keep/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/other_branch

test/integration/mergeConflictsFiltered/expected/.git_keep/ORIG_HEAD

@@ -0,0 +1 @@
+ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab

test/integration/mergeConflictsFiltered/expected/.git_keep/config

@@ -0,0 +1,10 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[user]
+	email = CI@example.com
+	name = CI

test/integration/mergeConflictsFiltered/expected/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration/mergeConflictsFiltered/expected/.git_keep/info/exclude

@@ -0,0 +1,7 @@
+# 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

test/integration/mergeConflictsFiltered/expected/.git_keep/logs/HEAD

@@ -0,0 +1,33 @@
+0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100	commit (initial): first commit
+416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100	checkout: moving from master to feature/cherry-picking
+416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI <CI@example.com> 1643188552 +1100	commit: first commit freshman year
+f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI <CI@example.com> 1643188552 +1100	commit: second commit subway eat fresh
+34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI <CI@example.com> 1643188552 +1100	commit: third commit fresh
+66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI <CI@example.com> 1643188552 +1100	commit: fourth commit cool
+f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI <CI@example.com> 1643188552 +1100	commit: fifth commit nice
+4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI <CI@example.com> 1643188552 +1100	commit: sixth commit haha
+93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI <CI@example.com> 1643188552 +1100	commit: seventh commit yeah
+951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100	commit: eighth commit woo
+1fb30058516518ac1579a8df132b0e4dade8e51d 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100	checkout: moving from feature/cherry-picking to develop
+1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI <CI@example.com> 1643188552 +1100	commit: first commit on develop
+40844e90419651d425c0845ec6f7c64ff63ebf03 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100	checkout: moving from develop to master
+416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI <CI@example.com> 1643188552 +1100	commit: first commit on master
+165a3cfaf6a1d3d757fb7b1c509598a395108079 40844e90419651d425c0845ec6f7c64ff63ebf03 CI <CI@example.com> 1643188552 +1100	checkout: moving from master to develop
+40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI <CI@example.com> 1643188552 +1100	commit: second commit on develop
+9c59217622ae74189d18f2992121f97dd28e966b 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI <CI@example.com> 1643188552 +1100	checkout: moving from develop to master
+165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI <CI@example.com> 1643188552 +1100	commit: second commit on master
+454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f 9c59217622ae74189d18f2992121f97dd28e966b CI <CI@example.com> 1643188552 +1100	checkout: moving from master to develop
+9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI <CI@example.com> 1643188552 +1100	commit: third commit on develop
+ba211bf3464f9c0429483a83963c1c69e1f53d4e 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI <CI@example.com> 1643188552 +1100	checkout: moving from develop to master
+454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI <CI@example.com> 1643188552 +1100	commit: third commit on master
+a83aac98467d005729bc9d80fe98abba47d41495 ba211bf3464f9c0429483a83963c1c69e1f53d4e CI <CI@example.com> 1643188552 +1100	checkout: moving from master to develop
+ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI <CI@example.com> 1643188552 +1100	commit: fourth commit on develop
+85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b a83aac98467d005729bc9d80fe98abba47d41495 CI <CI@example.com> 1643188552 +1100	checkout: moving from develop to master
+a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100	commit: fourth commit on master
+cd97d8e8ca03000f761f0e041cea0b6039923e70 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100	checkout: moving from master to base_branch
+cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100	commit: file
+ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100	checkout: moving from base_branch to other_branch
+ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100	checkout: moving from other_branch to base_branch
+ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI <CI@example.com> 1643188552 +1100	commit: file changed
+06d48b81c12e9c1a3cc2704c0db337639a8cdf85 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100	checkout: moving from base_branch to other_branch
+ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI <CI@example.com> 1643188579 +1100	commit (merge): Merge branch 'develop' into other_branch

test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/base_branch

@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100	branch: Created from HEAD
+cd97d8e8ca03000f761f0e041cea0b6039923e70 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100	commit: file
+ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 06d48b81c12e9c1a3cc2704c0db337639a8cdf85 CI <CI@example.com> 1643188552 +1100	commit: file changed

test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/develop

@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100	branch: Created from HEAD
+1fb30058516518ac1579a8df132b0e4dade8e51d 40844e90419651d425c0845ec6f7c64ff63ebf03 CI <CI@example.com> 1643188552 +1100	commit: first commit on develop
+40844e90419651d425c0845ec6f7c64ff63ebf03 9c59217622ae74189d18f2992121f97dd28e966b CI <CI@example.com> 1643188552 +1100	commit: second commit on develop
+9c59217622ae74189d18f2992121f97dd28e966b ba211bf3464f9c0429483a83963c1c69e1f53d4e CI <CI@example.com> 1643188552 +1100	commit: third commit on develop
+ba211bf3464f9c0429483a83963c1c69e1f53d4e 85aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b CI <CI@example.com> 1643188552 +1100	commit: fourth commit on develop

test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/feature/cherry-picking

@@ -0,0 +1,9 @@
+0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100	branch: Created from HEAD
+416ca3083a0651e1c8be3ad7e0dbe8547a62be8a f47cc13dc21c72755ff2d96d0805837dbb028951 CI <CI@example.com> 1643188552 +1100	commit: first commit freshman year
+f47cc13dc21c72755ff2d96d0805837dbb028951 34850e31f804a946d014b14443cf7387546877b0 CI <CI@example.com> 1643188552 +1100	commit: second commit subway eat fresh
+34850e31f804a946d014b14443cf7387546877b0 66340a9343a65aec523bfc57bd5a870eb4e05959 CI <CI@example.com> 1643188552 +1100	commit: third commit fresh
+66340a9343a65aec523bfc57bd5a870eb4e05959 f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec CI <CI@example.com> 1643188552 +1100	commit: fourth commit cool
+f9c5f8e0789c2eb9a6e37ba82a5b34be739989ec 4abe915d16bbc10f38b578390ff74c9ae62bf503 CI <CI@example.com> 1643188552 +1100	commit: fifth commit nice
+4abe915d16bbc10f38b578390ff74c9ae62bf503 93d727583328b5ce8f717380d014b87bd7893222 CI <CI@example.com> 1643188552 +1100	commit: sixth commit haha
+93d727583328b5ce8f717380d014b87bd7893222 951a2354eb5856644b0f1db74becc04c908beaa3 CI <CI@example.com> 1643188552 +1100	commit: seventh commit yeah
+951a2354eb5856644b0f1db74becc04c908beaa3 1fb30058516518ac1579a8df132b0e4dade8e51d CI <CI@example.com> 1643188552 +1100	commit: eighth commit woo

test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/master

@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 416ca3083a0651e1c8be3ad7e0dbe8547a62be8a CI <CI@example.com> 1643188552 +1100	commit (initial): first commit
+416ca3083a0651e1c8be3ad7e0dbe8547a62be8a 165a3cfaf6a1d3d757fb7b1c509598a395108079 CI <CI@example.com> 1643188552 +1100	commit: first commit on master
+165a3cfaf6a1d3d757fb7b1c509598a395108079 454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f CI <CI@example.com> 1643188552 +1100	commit: second commit on master
+454b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f a83aac98467d005729bc9d80fe98abba47d41495 CI <CI@example.com> 1643188552 +1100	commit: third commit on master
+a83aac98467d005729bc9d80fe98abba47d41495 cd97d8e8ca03000f761f0e041cea0b6039923e70 CI <CI@example.com> 1643188552 +1100	commit: fourth commit on master

test/integration/mergeConflictsFiltered/expected/.git_keep/logs/refs/heads/other_branch

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab CI <CI@example.com> 1643188552 +1100	branch: Created from HEAD
+ab7ecb7891c5f56480fba1ed3a6e0fa8e989efab 4c1db169d59c4345aba213cb79934f4e38222f02 CI <CI@example.com> 1643188579 +1100	commit (merge): Merge branch 'develop' into other_branch

test/integration/mergeConflictsFiltered/expected/.git_keep/objects/16/5a3cfaf6a1d3d757fb7b1c509598a395108079

@@ -0,0 +1,2 @@
+x
<01>ŽM
+Â0F]ç³$Éäg"BW=Æ4<C386>`ÁØÒFðø¼€»<E282AC>Ç{ðåµÖ¥<C396>ÕéÔvðÅùD“œŒ-º$ÏŽE‡’bB‡™lAµñ.¯΄̨	YoÄdšyŽ¢çIÈ»ÈÁöÁŠßí±î0ŒpÆ»|¸nO¹äµÞÀ‡†È{gc´V<C2B4>öSMþÔUYö£Á¯‚õ•<>«/+?Ž

test/integration/mergeConflictsFiltered/expected/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800

@@ -0,0 +1,2 @@
+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|Æ

test/integration/mergeConflictsFiltered/expected/.git_keep/objects/45/4b176d9e82bc3e0b5d5fd93fa5ad3a58b7db5f

@@ -0,0 +1,2 @@
+x
<01><>M
+Β0…]η³$Σtς"BW=Ζd’Ά`<60><>FπψΌ€ΛχψΎΗ“ZΚ³Α€ϊΤφ<CEA4>A‰Ω‹uθD[¶θ<C2B6><CEB8>.Ϊyμq<CEBC>‹ς”ΤΖ{^ %6²πb“I<E2809C>ά<EFBFBD>q<14><>‚gµΧ.(~·Gέa<CEAD>α:Νχόα²½ςEjΉυ<CE89>Ρ χD<03>µV½ν§ZώWG–Ί&ψiPW(|t[}
i>?Ο

test/integration/mergeConflictsFiltered/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25

@@ -0,0 +1 @@
+x
å<>Ñ	€0CývŠLÐÅ\ãj<C3A3>VО´WÄí=Àü<08>„äãùM<†iìf.Œµ‚PUÊM¤HTá™3T¶`Q‘–¢9ƒ"×^òÂh‡d[éºóÓØËi+B<>Ø;ç~¥/ Y:/–¸<PÃ

test/integration/mergeConflictsFiltered/expected/.git_keep/objects/66/340a9343a65aec523bfc57bd5a870eb4e05959

@@ -0,0 +1,2 @@
+x
<01><>K
+آ0@]ه<14>d<>L><11><>#<23>Liءظ#x|^<5E>ٍك=x<>ص<EFBFBD>v0وN<D988><4E>@<40>)<29>أآ)<29>ة&{#<23>Cـآآق
;xت<78>ش<EFBFBD><D8B4><;X<>إي9"<22><>|AMY<13>م9ظ<1C>BF<42><46>}ع<1A>\اى.<2E>T<EFBFBD><54>\x<>7ذ<37>،<EFBFBD>ر9g­صA<D8B5><41>.ي<7F>/k+ِ<>`nْZشjc>

test/integration/mergeConflictsFiltered/expected/.git_keep/objects/85/aba0ff0b6e7c0a7f6180f9f6e7e8cdcb71ee3b

@@ -0,0 +1,3 @@
+x
<01>ŽA
+à E»ö³/G'F¡”BV9†Ž#)$1Szüz<>nÿ}×ey50ˆ—¶‹€ÄHžŠÍÔ&Ÿ|.ԧ̆¼„€F÷Ì6«-î²6HñTS±ä¨Ödy½
Î2²‚¥;¯DÅ£Mu‡a„û0>å—m–×å
èÈ¢÷]gàŠ¨µ:éÕäϹ*õØÛ?
ê
+YÞ2×M}
OÆA7

test/integration/mergeConflictsFiltered/expected/.git_keep/objects/93/d727583328b5ce8f717380d014b87bd7893222

@@ -0,0 +1,3 @@
+x
ŤŽK
+Â0@]çł$“ďD„®zŚI:!‚±ĄFčń-x
·Ź÷ŕ奵GŁÝ©o"<22>qžŃ;¶±”}"
+h8"Ba˛É“Zy“WÇIô3†”2ęb)ůHvĐGčňŔL*^[Ĺź^—
Ć	®ăt—ťŰú”K^Ú
08‹DŢ8#j­zLuůSWďÇŢ+ü*¨\Y}
°=í

test/integration/mergeConflictsFiltered/expected/.git_keep/objects/ab/7ecb7891c5f56480fba1ed3a6e0fa8e989efab

@@ -0,0 +1,2 @@
+x
<01>ÎA
+à @Ñ®=…ûB™Ñ¨3PJ!«cÔ‘’&=~s„n?oñ˶®s·Èx釪u@¡P­ ÊA+Ö¡f'™©Å˜9<CB9C>Ô”Ì.‡¾»-•S%¥"à
 ¥ˆ
,*<2A>#xfç5<C3A7>‘Om‡'{§§~eݽ•m}XŒƒG¢œ½"˜³žS]ÿä¦Í‹š>"94