development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

add test repository ready to merge

Browse source
This commit is contained in:
Brendan Forster 2018-10-31 16:09:36 -03:00
parent 6cfa767416
commit 53dd0fce3c
27 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/test/fixtures/detect-conflict-in-binary-file/_git/COMMIT_EDITMSG vendored Normal file
View file

@ -0,0 +1 @@
one more change

1
app/test/fixtures/detect-conflict-in-binary-file/_git/HEAD vendored Normal file
View file

@ -0,0 +1 @@
ref: refs/heads/make-a-change

1
app/test/fixtures/detect-conflict-in-binary-file/_git/ORIG_HEAD vendored Normal file
View file

@ -0,0 +1 @@
f9b55b3f29827034d56ee8cf275de9e22bd49a99

7
app/test/fixtures/detect-conflict-in-binary-file/_git/config vendored Normal file
View file

@ -0,0 +1,7 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true

1
app/test/fixtures/detect-conflict-in-binary-file/_git/description vendored Normal file
View file

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

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/index vendored Normal file
View file

Binary file not shown.

6
app/test/fixtures/detect-conflict-in-binary-file/_git/info/exclude vendored Normal file
View file

@ -0,0 +1,6 @@
# 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]
# *~

9
app/test/fixtures/detect-conflict-in-binary-file/_git/logs/HEAD vendored Normal file
View file

@ -0,0 +1,9 @@
0000000000000000000000000000000000000000 85349ad98020363d853e1b0579d332ebfb91fd9b Brendan Forster <github@brendanforster.com> 1541012226 -0300 commit (initial): added the first image
85349ad98020363d853e1b0579d332ebfb91fd9b 85349ad98020363d853e1b0579d332ebfb91fd9b Brendan Forster <github@brendanforster.com> 1541012231 -0300 checkout: moving from master to make-a-change
85349ad98020363d853e1b0579d332ebfb91fd9b f9b55b3f29827034d56ee8cf275de9e22bd49a99 Brendan Forster <github@brendanforster.com> 1541012260 -0300 commit: changed the image in a branch
f9b55b3f29827034d56ee8cf275de9e22bd49a99 85349ad98020363d853e1b0579d332ebfb91fd9b Brendan Forster <github@brendanforster.com> 1541012264 -0300 checkout: moving from make-a-change to master
85349ad98020363d853e1b0579d332ebfb91fd9b 807b13f4c677f3bba1a6a16cfe45a43a4324616a Brendan Forster <github@brendanforster.com> 1541012288 -0300 commit: change the image on master
807b13f4c677f3bba1a6a16cfe45a43a4324616a 807b13f4c677f3bba1a6a16cfe45a43a4324616a Brendan Forster <github@brendanforster.com> 1541012296 -0300 checkout: moving from master to another-branch
807b13f4c677f3bba1a6a16cfe45a43a4324616a 951d91c33efeacee3cf6ba54b57afd6a3ad4f18a Brendan Forster <github@brendanforster.com> 1541012311 -0300 commit: one more change
951d91c33efeacee3cf6ba54b57afd6a3ad4f18a f9b55b3f29827034d56ee8cf275de9e22bd49a99 Brendan Forster <github@brendanforster.com> 1541012329 -0300 checkout: moving from another-branch to make-a-change
f9b55b3f29827034d56ee8cf275de9e22bd49a99 f9b55b3f29827034d56ee8cf275de9e22bd49a99 Brendan Forster <github@brendanforster.com> 1541012578 -0300 reset: moving to HEAD

2
app/test/fixtures/detect-conflict-in-binary-file/_git/logs/refs/heads/another-branch vendored Normal file
View file

@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 807b13f4c677f3bba1a6a16cfe45a43a4324616a Brendan Forster <github@brendanforster.com> 1541012296 -0300 branch: Created from HEAD
807b13f4c677f3bba1a6a16cfe45a43a4324616a 951d91c33efeacee3cf6ba54b57afd6a3ad4f18a Brendan Forster <github@brendanforster.com> 1541012311 -0300 commit: one more change

2
app/test/fixtures/detect-conflict-in-binary-file/_git/logs/refs/heads/make-a-change vendored Normal file
View file

@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 85349ad98020363d853e1b0579d332ebfb91fd9b Brendan Forster <github@brendanforster.com> 1541012231 -0300 branch: Created from HEAD
85349ad98020363d853e1b0579d332ebfb91fd9b f9b55b3f29827034d56ee8cf275de9e22bd49a99 Brendan Forster <github@brendanforster.com> 1541012260 -0300 commit: changed the image in a branch

2
app/test/fixtures/detect-conflict-in-binary-file/_git/logs/refs/heads/master vendored Normal file
View file

@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 85349ad98020363d853e1b0579d332ebfb91fd9b Brendan Forster <github@brendanforster.com> 1541012226 -0300 commit (initial): added the first image
85349ad98020363d853e1b0579d332ebfb91fd9b 807b13f4c677f3bba1a6a16cfe45a43a4324616a Brendan Forster <github@brendanforster.com> 1541012288 -0300 commit: change the image on master

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/43/ad2bfc1d942394575153fc5bde254651ec613f vendored Normal file
View file

Binary file not shown.

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/53/94b63bf7830657a8529192db04a9913637fd37 vendored Normal file
View file

Binary file not shown.

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/58/f54b26b4d22d4d7ef3a5178bb8e54b3f20ef50 vendored Normal file
View file

Binary file not shown.

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/7d/a83e495976a27f1abc5a49f296042bade37293 vendored Normal file
View file

Binary file not shown.

1
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/80/7b13f4c677f3bba1a6a16cfe45a43a4324616a vendored Normal file
View file

@ -0,0 +1 @@
x¥ŽA!=óŠù€v…ÄãÁ Ìàî<C3A0>Å þ_Ì>Á[w%ÕéTKY;ØÙz<13>$abq„ Ñ1j“bf/Lgç|ò1çlR/j²uðº@¼¶gäÑÅD=<3D>#Z‰9“9DEŸ¾Ô÷a1mð¨íÝ¥Áå¹öåoqçyǧTËÌäŒ6ÖzG<>Z«AÇÙŸö׌J mO<6D>¾¬…FªúýQ_¼öU~

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/85/349ad98020363d853e1b0579d332ebfb91fd9b vendored Normal file
View file

Binary file not shown.

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/8d/e4e8ef73caec02726414b9d6842fb609b7c8db vendored Normal file
View file

Binary file not shown.

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/93/7fe9edabbcc419cb852e15ab6c168dc44bb182 vendored Normal file
View file

Binary file not shown.

3
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/95/1d91c33efeacee3cf6ba54b57afd6a3ad4f18a vendored Normal file
View file

@ -0,0 +1,3 @@
xЅ<>M
Т0F]чs%<25>ПЖ ".МЧЬtвКh#1НП<D09D>AјVоу<D0BE>В,Џ.кSЋЊ0ј.ы #1<><1C>ћш#qL§(!0cяЬ<D18F>ЊЎ zл1њ$u]іЬ<D196><D0AC><08>d <0A><>пчBТD<D0A2>Ж6<D096>
<EFBFBD>нi<>gЉ<67>ІЎгЋЭпљрљР)Ы 0Дш<"<22>­Зжьt?ћгўЪ<D19E>В*,Ѕ*ШLыЄц <0B>ЌQп

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/ad/8f0698562a3761e11c9d9a1ddb5c6addc86824 vendored Normal file
View file

Binary file not shown.

BIN
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/ce/95de4a313a334d301cbfd8eda7448c8bf9442c vendored Normal file
View file

Binary file not shown.

2
app/test/fixtures/detect-conflict-in-binary-file/_git/objects/f9/b55b3f29827034d56ee8cf275de9e22bd49a99 vendored Normal file
View file

@ -0,0 +1,2 @@
x¥ŽQnÄ DûÍ)|<7C>VÆ@RUUûÑ{ØÁ„|„¬({ÿ¥Ú#ôg¤y£Ív<C38D>ç1€ÿ6º*„X‚ZÄg¢ìóªÅq°k‰:Wµ4wîÚÄà|âœ"ºÅåéÕ
†5eçH¥H²%'1üõêp›­Ì ~®þ;´Ãç~Œú<C592>oyñòÂÛu~<7E> Þ¢%ZÞÑ!šIçÙ¿Ú¿fÌV¹íšaT…ãä}jéܶjž`·UÑ

1
app/test/fixtures/detect-conflict-in-binary-file/_git/refs/heads/another-branch vendored Normal file
View file

@ -0,0 +1 @@
951d91c33efeacee3cf6ba54b57afd6a3ad4f18a

1
app/test/fixtures/detect-conflict-in-binary-file/_git/refs/heads/make-a-change vendored Normal file
View file

@ -0,0 +1 @@
f9b55b3f29827034d56ee8cf275de9e22bd49a99

1
app/test/fixtures/detect-conflict-in-binary-file/_git/refs/heads/master vendored Normal file
View file

@ -0,0 +1 @@
807b13f4c677f3bba1a6a16cfe45a43a4324616a

BIN
app/test/fixtures/detect-conflict-in-binary-file/my-cool-image.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 99 KiB