diff options
Diffstat (limited to 'test/integration/mergeConflicts')
108 files changed, 0 insertions, 400 deletions
diff --git a/test/integration/mergeConflicts/config/config.yml b/test/integration/mergeConflicts/config/config.yml deleted file mode 100644 index 718ebf70d..000000000 --- a/test/integration/mergeConflicts/config/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -disableStartupPopups: true -gui: - showFileTree: false -refresher: - refreshInterval: 1 diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index b41fd4b11..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -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 -# diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/FETCH_HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/HEAD deleted file mode 100644 index 904a2e296..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other_branch diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD b/test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index c7c35a1e7..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -562af0640203fb5a6e92c090d8d1ded26806d2c4 diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/config b/test/integration/mergeConflicts/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/description b/test/integration/mergeConflicts/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/index b/test/integration/mergeConflicts/expected/repo/.git_keep/index Binary files differdeleted file mode 100644 index 4e5ae2746..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/index +++ /dev/null diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude b/test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/mergeConflicts/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -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 foll |