diff options
Diffstat (limited to 'test/integration/pullMerge/expected/origin')
17 files changed, 0 insertions, 23 deletions
diff --git a/test/integration/pullMerge/expected/origin/HEAD b/test/integration/pullMerge/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMerge/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMerge/expected/origin/config b/test/integration/pullMerge/expected/origin/config deleted file mode 100644 index 90705ff13..000000000 --- a/test/integration/pullMerge/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMerge/actual/./repo diff --git a/test/integration/pullMerge/expected/origin/description b/test/integration/pullMerge/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMerge/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMerge/expected/origin/info/exclude b/test/integration/pullMerge/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullMerge/expected/origin/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 following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -.DS_Store diff --git a/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e b/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e Binary files differdeleted file mode 100644 index ce0f31a5a..000000000 --- a/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 Binary files differdeleted file mode 100644 index 7f2ebf4ee..000000000 --- a/test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 Binary files differdeleted file mode 100644 index f74bf2335..000000000 --- a/test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad b/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad deleted file mode 100644 index 660fe0a45..000000000 --- a/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJF))1P!")#tyS5[ SPDYXgӽsuq8zK@&I"zzNɝ}˲* 6%,
\ No newline at end of file diff --git a/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d b/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d deleted file mode 100644 index e4b84263d..000000000 --- a/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9E$Dz`R"~kkKwU*NJ4!sVaG>9$4[-PH$`UZ5W)nb0&e5 n^ܶ^,2EOQX '7[9%
\ No newline at end of file diff --git a/test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce Binary files differdeleted file mode 100644 index 0a734f981..000000000 --- a/test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 Binary files differdeleted file mode 100644 index 31ae3f5ba..000000000 --- a/test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 b/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 Binary files differdeleted file mode 100644 index 4e97dab19..000000000 --- a/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 Binary files differdeleted file mode 100644 index 285df3e5f..000000000 --- a/test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 Binary files differdeleted file mode 100644 index 96d2e71a6..000000000 --- a/test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 Binary files differdeleted file mode 100644 index d39fa7d2f..000000000 --- a/test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b Binary files differdeleted file mode 100644 index 9b771fc2f..000000000 --- a/test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b +++ /dev/null diff --git a/test/integration/pullMerge/expected/origin/packed-refs b/test/integration/pullMerge/expected/origin/packed-refs deleted file mode 100644 index e6e25ae85..000000000 --- a/test/integration/pullMerge/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -291b985e75f255f9947f064aee9e1f37af1a930d refs/heads/master |