migrate merge conflict tests

pkg/integration/tests/conflicts/filter.go

@@ -0,0 +1,38 @@
+package conflicts
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
+)
+
+var Filter = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Ensures that when there are merge conflicts, the files panel only shows conflicted files",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shared.CreateMergeConflictFiles(shell)
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			IsFocused().
+			Lines(
+				Contains("UU").Contains("file1").IsSelected(),
+				Contains("UU").Contains("file2"),
+			).
+			Press(keys.Files.OpenStatusFilter).
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("Filtering")).
+					Select(Contains("Reset filter")).
+					Confirm()
+			}).
+			Lines(
+				Contains("UU").Contains("file1").IsSelected(),
+				Contains("UU").Contains("file2"),
+				// now we see the non-merge conflict file
+				Contains("A ").Contains("file3"),
+			)
+	},
+})

pkg/integration/tests/conflicts/resolve_externally.go

@@ -0,0 +1,33 @@
+package conflicts
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
+)
+
+var ResolveExternally = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Ensures that when merge conflicts are resolved outside of lazygit, lazygit prompts you to continue",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shared.CreateMergeConflictFile(shell)
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			IsFocused().
+			Lines(
+				Contains("UU file").IsSelected(),
+			).
+			Tap(func() {
+				t.Shell().UpdateFile("file", "resolved content")
+			}).
+			Press(keys.Universal.Refresh)
+
+		t.Actions().ContinueOnConflictsResolved()
+
+		t.Views().Files().
+			IsEmpty()
+	},
+})

pkg/integration/tests/conflicts/resolve_multiple_files.go

@@ -0,0 +1,54 @@
+package conflicts
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
+)
+
+var ResolveMultipleFiles = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Ensures that upon resolving conflicts for one file, the next file is selected",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shared.CreateMergeConflictFiles(shell)
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			IsFocused().
+			Lines(
+				Contains("UU").Contains("file1").IsSelected(),
+				Contains("UU").Contains("file2"),
+			).
+			PressEnter()
+
+		t.Views().MergeConflicts().
+			IsFocused().
+			SelectedLines(
+				Contains("<<<<<<< HEAD"),
+				Contains("First Change"),
+				Contains("======="),
+			).
+			PressPrimaryAction()
+
+		t.Views().Files().
+			IsFocused().
+			Lines(
+				Contains("UU").Contains("file2").IsSelected(),
+			).
+			PressEnter()
+
+		// coincidentally these files have the same conflict
+		t.Views().MergeConflicts().
+			IsFocused().
+			SelectedLines(
+				Contains("<<<<<<< HEAD"),
+				Contains("First Change"),
+				Contains("======="),
+			).
+			PressPrimaryAction()
+
+		t.Actions().ContinueOnConflictsResolved()
+	},
+})

pkg/integration/tests/shared/conflicts.go

@@ -60,6 +60,33 @@ var CreateMergeCommit = func(shell *Shell) {
 	shell.ContinueMerge()
 }
 
+// creates a merge conflict where there are two files with conflicts and a separate file without conflicts
+var CreateMergeConflictFiles = func(shell *Shell) {
+	shell.
+		NewBranch("original-branch").
+		EmptyCommit("one").
+		EmptyCommit("two").
+		EmptyCommit("three").
+		CreateFileAndAdd("file1", OriginalFileContent).
+		CreateFileAndAdd("file2", OriginalFileContent).
+		Commit("original").
+		NewBranch("first-change-branch").
+		UpdateFileAndAdd("file1", FirstChangeFileContent).
+		UpdateFileAndAdd("file2", FirstChangeFileContent).
+		Commit("first change").
+		Checkout("original-branch").
+		NewBranch("second-change-branch").
+		UpdateFileAndAdd("file1", SecondChangeFileContent).
+		UpdateFileAndAdd("file2", SecondChangeFileContent).
+		// this file is not changed in the second branch
+		CreateFileAndAdd("file3", "content").
+		Commit("second change").
+		EmptyCommit("second-change-branch unrelated change").
+		Checkout("first-change-branch")
+
+	shell.RunShellCommandExpectError("git merge --no-edit second-change-branch")
+}
+
 // These 'multiple' variants are just like the short ones but with longer file contents and with multiple conflicts within the file.
 
 var OriginalFileContentMultiple = `
@@ -110,8 +137,7 @@ Other
 Other Second Change
 `
 
-// prepares us for a rebase/merge that has conflicts
-var MergeConflictsSetupMultiple = func(shell *Shell) {
+var CreateMergeConflictFileMultiple = func(shell *Shell) {
 	shell.
 		NewBranch("original-branch").
 		EmptyCommit("one").
@@ -128,16 +154,6 @@ var MergeConflictsSetupMultiple = func(shell *Shell) {
 		Commit("second change").
 		EmptyCommit("second-change-branch unrelated change").
 		Checkout("first-change-branch")
-}
-
-var CreateMergeConflictFileMultiple = func(shell *Shell) {
-	MergeConflictsSetupMultiple(shell)
 
 	shell.RunShellCommandExpectError("git merge --no-edit second-change-branch")
 }
-
-var CreateMergeCommitMultiple = func(shell *Shell) {
-	CreateMergeConflictFileMultiple(shell)
-	shell.UpdateFileAndAdd("file", SecondChangeFileContentMultiple)
-	shell.ContinueMerge()
-}

pkg/integration/tests/tests_gen.go

@@ -59,6 +59,9 @@ var tests = []*components.IntegrationTest{
 	commit.StagedWithoutHooks,
 	commit.Unstaged,
 	config.RemoteNamedStar,
+	conflicts.Filter,
+	conflicts.ResolveExternally,
+	conflicts.ResolveMultipleFiles,
 	conflicts.UndoChooseHunk,
 	custom_commands.Basic,
 	custom_commands.FormPrompts,

test/integration/mergeConflicts/config/config.yml

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

test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -1,36 +0,0 @@
-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/mergeConflicts/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:   cherrypicking6
-#	new file:   cherrypicking7
-#	new file:   cherrypicking8
-#	new file:   cherrypicking9
-#	modified:   file1
-#	modified:   file4
-#	modified:   file5
-#

test/integration/mergeConflicts/expected/repo/.git_keep/HEAD

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

test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD

@@ -1 +0,0 @@
-562af0640203fb5a6e92c090d8d1ded26806d2c4

test/integration/mergeConflicts/expected/repo/.git_keep/config

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

test/integration/mergeConflicts/expected/repo/.git_keep/description

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

test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude

@@ -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

test/integration/mergeConflicts/expected/repo/.git_keep/logs/HEAD

@@ -1,34 +0,0 @@
-0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000	commit (initial): first commit
-1618ce1085acb41fd710e279ac38911aadfb0a09 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000	checkout: moving from master to feature/cherry-picking
-1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI <CI@example.com> 1617671441 +1000	commit: first commit freshman year
-b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI <CI@example.com> 1617671441 +1000	commit: second commit subway eat fresh
-f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI <CI@example.com> 1617671441 +1000	commit: third commit fresh
-edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI <CI@example.com> 1617671441 +1000	commit: fourth commit cool
-cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI <CI@example.com> 1617671441 +1000	commit: fifth commit nice
-b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI <CI@example.com> 1617671441 +1000	commit: sixth commit haha
-df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI <CI@example.com> 1617671441 +1000	commit: seventh commit yeah
-1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000	commit: eighth commit woo
-d3e2708327280097b5e1f8ab69309934b24f8b64 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000	checkout: moving from feature/cherry-picking to develop
-d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI <CI@example.com> 1617671441 +1000	commit: first commit on develop
-a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000	checkout: moving from develop to master
-1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000	commit: first commit on master
-f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI <CI@example.com> 1617671441 +1000	checkout: moving from master to develop
-a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI <CI@example.com> 1617671441 +1000	commit: second commit on develop
-55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000	checkout: moving from develop to master
-f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000	commit: second commit on master
-a19ec0b99e516795f349033f09383f87be0b74e9 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI <CI@example.com> 1617671441 +1000	checkout: moving from master to develop
-55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI <CI@example.com> 1617671441 +1000	commit: third commit on develop
-dd259e90c3748e269bdf1ee3ce537a006d2394aa a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000	checkout: moving from develop to master
-a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000	commit: third commit on master
-61db24350a92fa37b2fe35f13eb3dd3f7655f6cf dd259e90c3748e269bdf1ee3ce537a006d2394aa CI <CI@example.com> 1617671441 +1000	checkout: moving from master to develop
-dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI <CI@example.com> 1617671441 +1000	commit: fourth commit on develop
-e563585cb87cc39b553ca421902d631ea8890118 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000	checkout: moving from develop to master
-61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000	commit: fourth commit on master
-559043765dc6c32c943b6278b4abbff1e6f52839 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000	checkout: moving from master to base_branch
-559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000	commit: file
-0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000	checkout: moving from base_branch to other_branch
-0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000	checkout: moving from other_branch to base_branch
-0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI <CI@example.com> 1617671441 +1000	commit: file changed
-341cf8213827614a274c750cd7dec4307eb41de7 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000	checkout: moving from base_branch to other_branch
-0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI <CI@example.com> 1617671444 +1000	commit: asd
-562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI <CI@example.com> 1617671461 +1000	commit (merge): Merge branch 'develop' into other_branch

test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/base_branch

@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000	branch: Created from HEAD
-559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000	commit: file
-0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI <CI@example.com> 1617671441 +1000	commit: file changed

test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/develop

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000	branch: Created from HEAD
-d3e2708327280097b5e1f8ab69309934b24f8b64 a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b CI <CI@example.com> 1617671441 +1000	commit: first commit on develop
-a1e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b 55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 CI <CI@example.com> 1617671441 +1000	commit: second commit on develop
-55f688e6b47b7a5ca8ffc4e25b77c1af6222b503 dd259e90c3748e269bdf1ee3ce537a006d2394aa CI <CI@example.com> 1617671441 +1000	commit: third commit on develop
-dd259e90c3748e269bdf1ee3ce537a006d2394aa e563585cb87cc39b553ca421902d631ea8890118 CI <CI@example.com> 1617671441 +1000	commit: fourth commit on develop

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

@@ -1,9 +0,0 @@
-0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000	branch: Created from HEAD
-1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI <CI@example.com> 1617671441 +1000	commit: first commit freshman year
-b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI <CI@example.com> 1617671441 +1000	commit: second commit subway eat fresh
-f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI <CI@example.com> 1617671441 +1000	commit: third commit fresh
-edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI <CI@example.com> 1617671441 +1000	commit: fourth commit cool
-cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI <CI@example.com> 1617671441 +1000	commit: fifth commit nice
-b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI <CI@example.com> 1617671441 +1000	commit: sixth commit haha
-df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI <CI@example.com> 1617671441 +1000	commit: seventh commit yeah
-1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000	commit: eighth commit woo

test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000	commit (initial): first commit
-1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000	commit: first commit on master
-f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000	commit: second commit on master
-a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000	commit: third commit on master
-61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000	commit: fourth commit on master

test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/other_branch

@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000	branch: Created from HEAD
-0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI <CI@example.com> 1617671444 +1000	commit: asd
-562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI <CI@example.com> 1617671461 +1000	commit (merge): Merge branch 'develop' into other_branch

test/integration/mergeConflicts/expected/repo/.git_keep/objects/1f/bc3eb4b11cb89b204a593572c2e01462ca5a89

@@ -1,4 +0,0 @@
-x
��M
-�0F]��d&͏��c��P��R���
-x
����������Ű��*,���g�>�Ӟ
-�MGΌ�X��;����

test/integration/mergeConflicts/expected/repo/.git_keep/objects/38/08a710b52a152bb73805fe274e0d877cf61800

@@ -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|�

test/integration/mergeConflicts/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25

@@ -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�

test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/9043765dc6c32c943b6278b4abbff1e6f52839

@@ -1,3 +0,0 @@
-x
��M
-�0F]��$��� "t�cL�*Sb
-߂p���K��G�
��7f06��e����a�4��HQ8瘲ڨ����k��i2!��	�&g#�;'>��������u^����=��j��q|@kΨ�V=�:�9WR��W�iP_P�}��m�A�

test/integration/mergeConflicts/expected/repo/.git_keep/objects/55/f688e6b47b7a5ca8ffc4e25b77c1af6222b503

@@ -1,6 +0,0 @@
-x
��A
-�0E]��d&S�
-"BW=F&3E�mJ���
-x
���>/�eyT�D�����L�R4�`�2w�G1�Tz�>d�Ĉ�mi��B"C�"1�0E�r�����䅣	�������0�eo�I�6�)��
-(���#8"�F[T�?��i��
-?

test/integration/mergeConflicts/expected/repo/.git_keep/objects/61/db24350a92fa37b2fe35f13eb3dd3f7655f6cf

@@ -1,2 +0,0 @@
-x
��M
-�0�a�9���i&?"BW=F�Nh��R#x|^�����7��.

test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/9ec0b99e516795f349033f09383f87be0b74e9

@@ -1,2 +0,0 @@
-x
��M
-�0�]��d�i�"BW=�$��`��F�������>ދ��g����v@��h,و�

test/integration/mergeConflicts/expected/repo/.git_keep/objects/a1/e00cd67130c6f7e2b9bb7f23f0cda2b37eb30b

@@ -1,4 +0,0 @@
-x
��K
-�0@]��d&�|
-"BW=F�L��6�F������{�R]���&<�]4��9x� �L)Jb�F<���Ǚ�6��6�F��`��
���
-�0F��:�Qs	ѱ_�Qw����]>���rIu�
9��3��Q��j���ʴ?�*�+dy�\7���>�

test/integration/mergeConflicts/expected/repo/.git_keep/objects/b2/d5312a06a9c56e9ada21c48a12f57ce8dd4c4a

@@ -1,3 +0,0 @@
-x
���
-�0E]�+f/H&�}���U?c2��cKA�ފ?��r�����\�qu( U��A����c]�PA�j�C�D�֬��(�5�
-��Y4x�c���D��cc�b;#�2-���.�p�K�z�I�t�6��al�5���*�7q�[��E1c��<�

test/integration/mergeConflicts/expected/repo/.git_keep/objects/d3/e2708327280097b5e1f8ab69309934b24f8b64

@@ -1,3 +0,0 @@
-x
��M
-�0F]��$��I"BW=F2Nm��R"z|^���{��[�K�ݡo"�%���̥��Ll������bd�Ԛ7yv�����
-"����>Y���p�9&�_}n#���*�\ׇ��� a���!Qk��u?��O\�r��?

test/integration/mergeConflicts/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c

@@ -1 +0,0 @@
-x
���	�0C����?�3�ƵV�=iO��=�������,
�8tW��@h*��&R$j�*y��ʑs-ܜ��8v)��u㧱��V�H������"��

test/integration/mergeConflicts/expected/repo/.git_keep/objects/dd/259e90c3748e269bdf1ee3ce537a006d2394aa

@@ -1,3 +0,0 @@
-x
��K
-�0@]��d&�i@D��cL�	-XSJ����>ރWں.,��敖B�X'a�Rgb��=�˾:L�S1����B�à1{�,��Pk�jCf.$5Zks@g�����x��x��[������P$�L�	͗~�����>/��
-�&}��m���@;

test/integration/mergeConflicts/expected/repo/.git_keep/objects/e5/63585cb87cc39b553ca421902d631ea8890118

@@ -1,2 +0,0 @@
-x
��M
-� F���/G�?PJ!�C�	)�Ĕ��^����_���:(�Ko��1��&��O�f�ee<��J��5�=6�:�!p�Y��+�Ȭ3�E)-)L�"}�

test/integration/mergeConflicts/expected/repo/.git_keep/objects/f8/dd12b796f400be7f59d9471670c3080f9c90a1

@@ -1 +0,0 @@
-x
�ϻj1����ӹ���4� ��+y���l��]-B1~�,��i��5��u�`��FW}&e#.����������YR�����u��ӌb����%��#�P�j��J�b��:1.���/����)�2E�*�4��(L�{,�����˻>Һ�����

test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/base_branch

@@ -1 +0,0 @@
-341cf8213827614a274c750cd7dec4307eb41de7

test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/develop

@@ -1 +0,0 @@
-e563585cb87cc39b553ca421902d631ea8890118

test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/feature/cherry-picking

@@ -1 +0,0 @@
-d3e2708327280097b5e1f8ab69309934b24f8b64

test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/master

@@ -1 +0,0 @@
-559043765dc6c32c943b6278b4abbff1e6f52839

test/integration/mergeConflicts/expected/repo/.git_keep/refs/heads/other_branch

@@ -1 +0,0 @@
-f8dd12b796f400be7f59d9471670c3080f9c90a1

test/integration/mergeConflicts/expected/repo/cherrypicking1

@@ -1 +0,0 @@
-this is file number 1 that I'm going to cherry-pick

test/integration/mergeConflicts/expected/repo/cherrypicking2

@@ -1 +0,0 @@
-this is file number 2 that I'm going to cherry-pick

test/integration/mergeConflicts/expected/repo/cherrypicking3

@@ -1 +0,0 @@
-this is file number 3 that I'm going to cherry-pick

test/integration/mergeConflicts/expected/repo/cherrypicking4

@@ -1 +0,0 @@
-this is file number 4 that I'm going to cherry-pick

test/integration/mergeConflicts/expected/repo/cherrypicking5

@@ -1 +0,0 @@
-this is file number 5 that I'm going to cherry-pick

test/integration/mergeConflicts/expected/repo/cherrypicking6

@@ -1 +0,0 @@
-this is file number 6 that I'm going to cherry-pick