joCwajmFmEG320KvHmlww

foo.txt

@@ -0,0 +1,17 @@
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+fooddd
+fooddd
+fooddd
+fooddd
+fooddd

go.mod

@@ -1,3 +1,9 @@
 module intermodi.cc/p3ls/test
 
 go 1.16
+
+require (
+	github.com/ericchiang/pup v0.4.0 // indirect
+	github.com/fatih/color v1.14.1 // indirect
+	golang.org/x/net v0.5.0 // indirect
+)

go.sum

@@ -0,0 +1,41 @@
+github.com/ericchiang/pup v0.4.0 h1:h9ahJXbHA3V8MFfAmasxi8DCx0Gu+aLAAEtb8Q3KCOo=
+github.com/ericchiang/pup v0.4.0/go.mod h1:PpPzKkuAB7ypCQf9+wxC5MzaGaIDdgjtlpvc/0NaTJc=
+github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
+github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

main.go

@@ -3,5 +3,8 @@ package main
 import "fmt"
 
 func main() {
-	fmt.Println("test2")
+	// foo
+	// bar
+	// baz
+	fmt.Println("hello from test!")
 }

mgmt/app/state/save.yml

@@ -0,0 +1 @@
+

mgmt/debug.yml

@@ -0,0 +1,4 @@
+- debug:
+    msg: hello from debug
+
+- import_tasks: import-b.yml

mgmt/git/push.yml

@@ -0,0 +1,22 @@
+- git_info: "git.intermodi.ch/p3ls/test"
+  register: repo
+
+- set_fact:
+    line: "{{ '21' | randomstring }}"
+
+- lineinfile:
+    dest: "{{ repo.dest }}/test.txt"
+    line: "{{ line }}"
+
+- git_commit:
+    repo: "git.intermodi.ch/p3ls/test"
+    msg: "{{ line }}"
+
+- git_info: "git.intermodi.ch/p3ls/test"
+  register: repo
+
+- git_tag: "git.intermodi.ch/p3ls/test"
+  when: not repo.last_commit_is_tagged
+
+- git_push: "git.intermodi.ch/p3ls/test"
+

mgmt/import-b.yml

@@ -0,0 +1,3 @@
+- debug:
+    msg: hello from import b
+

mgmt/import.yml

@@ -0,0 +1,4 @@
+- debug:
+    msg: hello from roles
+
+- import_tasks: debug.yml

mgmt/playground.yml

@@ -0,0 +1,12 @@
+- copy:
+    dest: /etc/cron.d/telekom-dns-lookup
+    content: |
+
+      # telekom-dns-lookup tool täglich 4 uhr morgens
+      0 4 * * * /usr/local/bin/telekom-dns-lookup > /dev/null
+
+      # asterisk -'core restart' when server is not busy
+      1 4 * * * /usr/sbin/asterisk -x "core restart when convenient" > /dev/null
+      
+    owner: root
+    group: crontab

mgmt/print.yml

@@ -1,2 +0,0 @@
-- debug:
-    msg: hello from {{ ansible_host }}

mgmt/release.yml

@@ -1,29 +0,0 @@
-
-# - debug:
-#     msg: hello
-
-- release:
-    name: test
-    owner: p3ls
-    path: ..
-    gitea: true
-    version: patch
-
-# - go_release:
-#     name: test
-#     owner: p3ls
-#     path: ..
-#     gitea: true
-#     targets: linux/arm
-#     version: patch
-
-# - update:
-#     owner: p3ls
-#     name: test
-    
-# - release:
-#     name: test
-#     owner: p3ls
-#     path: ../.
-#     gitea: true
-#     version: "1.0.0"

mgmt/release/create.yml

@@ -0,0 +1,35 @@
+
+# - go_build:
+#     repo: "git.intermodi.ch/p3ls/test"
+#     targets:
+#         - linux/amd64
+#         - linux/arm
+#         - linux/arm64
+#         - darwin/arm64
+#         - darwin/amd64
+#         - windows/amd64
+
+- import_tasks: ../git/push.yml
+
+# - go_build:
+#     repo: "git.intermodi.ch/p3ls/test"
+#     version: "{{ repo.tag }}"
+#     commit:  "{{ repo.commit }}"
+#     targets:
+#       - linux/amd64
+#       - darwin/arm64
+#       - windows/amd64
+#     binary: foobar
+#   register: bin
+
+- release_create:
+    repo: "git.intermodi.ch/p3ls/test"
+    # files: "{{ bin }}"
+    paths:
+        - test.txt
+        # - t1/test.txt
+        # - t2/test.txt
+        - html
+        - /Users/stef/Downloads/air.png
+    path: /Users/stef/Downloads/zoom-out.svg
+    push: true

mgmt/release/switch.yml

@@ -0,0 +1,7 @@
+- info: "script start"
+
+- release_switch:
+    repo: git.intermodi.ch/p3ls/test
+    version: "{{ version }}"
+
+- info: "script end"

mgmt/test.yml

@@ -0,0 +1,3 @@
+
+- debug:
+    msg: foo

mgmt/user.yml

@@ -0,0 +1,15 @@
+# - group:
+#     name: voip
+#     system: true
+
+- user:
+    name: asterisk
+    system: true
+    groups: voip
+    append: true
+
+# - user:
+#     name: dnsmasq
+#     system: true
+#     groups: voip
+#     append: true

msg.txt

@@ -1,3 +1,26 @@
 uuu
 uu
 u
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+dfff

sh/commit.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+echo foo >> msg.txt
+
+git add msg.txt
+
+git commit -m test
+
+mgmt --debug run mgmt/release.yml

t1/test.txt

@@ -0,0 +1,67 @@
+foo
+foo
+foo
+foo
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bla
+bla
+<<<<<<< HEAD
+bar
+bar
+bla
+=======
+>>>>>>> parent of 73942cd (update)
+bla
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+
+{{ foo | lorem: w }}
+7WODKNQeAVwbDJJl082Sg
+mc4oHCfEsY0tO0VLq4H1x
+DKH3McxpUM4yamo8lNako
+KqldfmpAxXR6cDeg4I49l
+dwVQUXipj1jV3om1ktBvI
+gVd9lam93Jo69zSokD0mG
+KjPzIPTbx1xs9PixlvDgC
+NgkBs3kdcm0GycRR2eWtr
+TnRaNtWwt28ao9N72jYCg
+cgAwdayYMrxNOwep3Iv1V
+z2XmqCJ6xQSErKIX000u4
+TZK0rCn3I3GiEnKashIOr
+mzAAjfjkz1tqXqpKpTs0y
+6BuxINcvFigGZHdPsT1u0
+xWACZys7idqsEkX0bvrPq
+ytL2DzwiA22jAsYvCJb0E
+R0ru3r1OZB6QZKdF44l5D
+6yvlEOrQJNcy98NLVSAQk
+0HLf6c2JBtJRb6EuKYekH
+MTLxkP0vFW0YXkrhHIOXI
+IVr960l1A5rQuj4ZBS1ZY
+faZoHYz7wS1crngedjQkk
+hmJjO2PrknsPh9m6bGVEK
+kBLfsxOB233y89KnJxF8n
+OzCR6h6a6M02d2XXFh8H4
+lxcEaRG5FsOOPp02qNKYL
+r2K2jARvAEe4Yqurgiy6L
+Slk1tiDiuRV4adrrMz0VH
+r49aePjvTqeyvZpV0I7kp
+75i3rKkOwELWUFkE8XOQe
+r0P62fa7dDHn0CoOapa9R

t2/n2.txt

@@ -0,0 +1,4 @@
+fffs
+
+ss
+s

t2/test.txt

@@ -0,0 +1,32 @@
+foo
+foo
+foo
+foo
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bla
+bla
+<<<<<<< HEAD
+bar
+bar
+bla
+=======
+>>>>>>> parent of 73942cd (update)
+bla
+foo
+foo
+foo
+foo
+foo
+f

t3/somedir/foo.txt

@@ -0,0 +1 @@
+foo.txt

t3/test.txt

@@ -0,0 +1,277 @@
+foo
+foo
+foo
+foo
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bar
+bla
+bla
+<<<<<<< HEAD
+bar
+bar
+bla
+=======
+>>>>>>> parent of 73942cd (update)
+bla
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+foo
+
+{{ foo | lorem: w }}
+7WODKNQeAVwbDJJl082Sg
+mc4oHCfEsY0tO0VLq4H1x
+DKH3McxpUM4yamo8lNako
+KqldfmpAxXR6cDeg4I49l
+dwVQUXipj1jV3om1ktBvI
+gVd9lam93Jo69zSokD0mG
+KjPzIPTbx1xs9PixlvDgC
+NgkBs3kdcm0GycRR2eWtr
+TnRaNtWwt28ao9N72jYCg
+cgAwdayYMrxNOwep3Iv1V
+z2XmqCJ6xQSErKIX000u4
+TZK0rCn3I3GiEnKashIOr
+mzAAjfjkz1tqXqpKpTs0y
+6BuxINcvFigGZHdPsT1u0
+xWACZys7idqsEkX0bvrPq
+ytL2DzwiA22jAsYvCJb0E
+R0ru3r1OZB6QZKdF44l5D
+6yvlEOrQJNcy98NLVSAQk
+0HLf6c2JBtJRb6EuKYekH
+MTLxkP0vFW0YXkrhHIOXI
+IVr960l1A5rQuj4ZBS1ZY
+faZoHYz7wS1crngedjQkk
+hmJjO2PrknsPh9m6bGVEK
+kBLfsxOB233y89KnJxF8n
+OzCR6h6a6M02d2XXFh8H4
+lxcEaRG5FsOOPp02qNKYL
+r2K2jARvAEe4Yqurgiy6L
+Slk1tiDiuRV4adrrMz0VH
+r49aePjvTqeyvZpV0I7kp
+75i3rKkOwELWUFkE8XOQe
+r0P62fa7dDHn0CoOapa9R
+zvwzqtQt9fq4r6tal0290
+whwXZRTkTWAtYQZSrSBfJ
+Uo8OXF3hjNZ0i5qr8sIa1
+Z33rJod9JBfUpfyg3y9d3
+kjS0CKv5vV1R98Kgjfzcq
+mwQ7Pxkq0ZzJ79ZxMVeUY
+qEt6AXfIMgjGSj0CbPG7N
+i7s0lIPlicqZLOBeVJqKn
+jGZw4ZY9DnOW9kg38M93w
+tXc8qPIwj4twpDA3FX5Lv
+LH06WF0uJGJ5dIoGvZywY
+KJKFUaHBQU20vnLvBvzjl
+9rz4F62DoE7cVXVg07Z2e
+dQud8qIlsk7B7ZAn4lr4m
+0exppwnmQEyyecm37ShLj
+ucOkWGJtF0jx3wP2JZDUo
+INwEm7tAMl7jfh5cBIJ4M
+2TGRvbhRc8vJqRgjVpoD8
+12YQ1gbqEywO47NGf11ps
+lci1jPsD6OV20Oo9uNw35
+DwXnqxMRfS8il6P2LR8xe
+lopPgHe00OireomEzl5G0
+HMqUgzt89RDUSNg131azF
+sTQVq9bpt0hivo0W3hRNe
+bY0e49fQjfH5t1MRKzCyI
+EAY6M9Brn2hQ0eBfF6Itd
+aGOUEh948fhp0SBhLwn0x
+NyPDGrnrWAMeljfuGWhB9
+058kHiy0wKUEmlEDp8x1S
+729o5NRsMVywFF1a3xWa7
+bFzi0ioskSPR6XYnhjwxu
+Qs4QPjOBWycXkjkntXKDv
+BiIgSdNAP4IrQD9PL5Aub
+kKXJLotcV4WG26A0wWagT
+0ZNOTL67IuvK7EAHaQzal
+sAnr9uoHGTYx5pZZHntRy
+0Dq52coE18IRod00gbhYF
+iP2sGuoECV6cyTgpCiKML
+5wriavwmXkFjNb2qJPy45
+2PbvTIQq3NPYmtLIItDQX
+7Li1MS6OYr8g7Cn8wSBUk
+tRgujFhRBUocDxkfxz4ho
+UoZoo3oL0nliJN50hb6AJ
+FhN7o0ue32S8SclvcZU20
+tT9ohnd2H0F4iGpFXddKn
+tsmRCzaqD4ATlzab84zQd
+jPiGnJve3O2DrYoAZT0pA
+tEsG00MNEnK9wgg94rGZH
+LlP39j0usoIcsBdDTpxke
+CXPXyVg3sM4B0Ibz96ppy
+VlY16AESH8sE5MfCp48St
+wAmoxqYlLbNH9mFuczcQP
+GwhzciQO9ZbO2O1O6sEVK
+MX19PXKUfbaNAhO7YdYMD
+UZ1lfKelYbyeKjpg3fWqI
+URs0cndtLNK6qtdeJeEx4
+X4U5N7j6b9poJ16CADwQf
+ggxSB9hglJFI1qSl8mtey
+GHftQlySLdauRwX9JV3Xf
+zLorJaA8ZEOvVH3U5Sd8C
+woJvSyHWS1mhWZJQqHGWr
+R6kT6nFFIGj0QWZI9tTNY
+ufwwFN9K53yAtwwg04qdm
+FN3sbhWZwPaxOBPd2LFsk
+1xexv03O5ylpmvJ6fpn5M
+k3OFdITX00Rdew3RTwtgP
+W9qIb4TcLj9t4NHfmArgt
+Jk7MTpHYEbLhYl4Hu7SBH
+8bJsG6jcymcZi4uTioU3h
+nF1XE3yMTdIIkI5M4tCkn
+iMm7ZgPFwaXuh0s33DxDM
+X2Y6DvKTI9qbUT3P9FoFy
+IoyAniPqk5WnDN54AsYYM
+lm9QJCMCVav7sXELkbc1Y
+bFG0mmFUyGd5FMU0Gxdw6
+jFuppdtnnQngpG6gV0elW
+oHamcXtCFRUA2AgsRpbsZ
+CDlqaHPT0GYJ7TBL9ysf6
+kLllFFTwRuzNwwp01ICgn
+DMYMBhO297IbkGL7zTm1o
+M5CrxC220aNW9eiHQ7CUn
+fN7vUNwuJLiJoJyI7MCf9
+tuSqDmCcaOW7Cw00lvNXO
+rqEHOSsoQDBLhoghYI2hH
+xobv2mGalSCi549NPxGms
+uaZGsUXOh4vUnDcRllu2b
+3c3wG2VFv0c8BjzT0uwN8
+Q30g63p8aaeIqkfaJ8Ea5
+GBniLanYfKgDH18HBAE5o
+60Hxj4SL9PSZt5xmuEAZ0
+SAiELqihUQurUhK1Oto83
+FR6uQhzqlsxKbBqeZSSGI
+HFJtZUYzBhyNrlYMOQmsl
+Fxmqa6H7mFYZg3WFpULr3
+L18PebLQQcfFqtLAZlne9
+MFPItaCBg2R01LOpTQMk0
+j4zScHlVSTY3gndHQMo7g
+DzMATACGrbWUh2oGJ5XyJ
+2mG3xLoPoH3MTAABrL1QP
+UkJ7SQh27JybFIeW9gqE5
+mYIdDGRpkjZ6EHopa0Yag
+K7G680ROSkYzHnRCTDhhb
+tbAyAxZksh4uj5mfR1sG9
+EnY8edIX2tdyLKjueCwhB
+VffF5lMRiw0hA4PYaoYPn
+bztG52kW2dm1X55ND72NX
+KKauMzcXWeEQU0R889Dwn
+omvAv8GIFtq2aM9QQphVy
+dU6Yy2naMjBPt304KNJiz
+5CaUUGRmEru813gmf6Jhy
+ormr4X0UBckCC5GFGKv83
+s2GQkZyPf0RVBserbcGpT
+Cl9GzMz7bDfYUFgHoAdAZ
+YreJLdtepHdv6a28mJ3eC
+SILOeugFPM5eM2lLzLCoF
+jdDzHFePrZrARvYSYz6lR
+mMwEs9DbeuJamwHfmLgqK
+TsfgLBNMJCjO8URHOCwaG
+igDQXlxMuIBTydqcm6Oa9
+qDtWVBCEgtVTTg3Ynb5OI
+3Ck7N7Ee5oMW1MurvzMof
+vmCdYzBNL6fYKrmzv3dis
+0ZVGubnPhroBxpjMhmHRb
+KSNCIf4ObDmJIoHnkFOnE
+0F9MFXkORr1wSODJdhjlt
+ADEKryM1G18a2q17lDcss
+26XhVaxODf4FlouSwVUB1
+rzIkC38YK3sUq87KKt0c6
+roOZTwKgGh1Rr81PMXWbC
+YCAwa6uLrt58ehvHDecUc
+eLz9WcNls39PgZCI94t06
+FZbU6nw2mOzYYIUPNCXH9
+zFI72lWl0bR6r0GUOYRAs
+0aJ68PKH55D64ueYJmkZK
+XFjzZ6v1AwV69Xi20BDBz
+rWL0i379XJRfxeh5WO2zC
+mJZphS0VQ7mBahfalCa4L
+QTcXPY6aIvuc5tSgu6VTI
+A2I6bD2WoD4h8EgfrSr08
+PWw5Kcr07qJoZTTPDEwQr
+3BPlZHtsceQvkM0iqHDF4
+femEkTeVpMyBj7O0iYHdH
+FOcm0gj8xEhjQ5w5dAS97
+FpJ7r2Tlt8CNa6qGl0mIM
+Pnx8ECb11fV4uVE1KHZ2V
+cIHASOfLOkox7m58Mu39D
+qfS3X0yeB6KC2mtDJSr0F
+9Oim5JAbFoqaCU4sEhRBj
+KBXfdEgV6g9ql3Y9xu2N8
+3CPYUBPIAU12C9FOBiu5G
+2b0Z0uvq4kWLRp3n8bBmJ
+xn46ofVqnQytw1HuAZXdk
+irP5aTPoxNRT48ZywBNMs
+pJAr3FtVQumQFO2CAkGM1
+mSmNK7j0ikVRy1iDAe6jQ
+0TftMfvosVo30gg8PVvwg
+FL5K3UFYkGwUMy6Ei95qv
+XFR9oG4PtVfWaYh9gZ700
+dLgnogwu4DW0eNc0XXJwp
+hNGaQPEOMx87yafumOGNc
+jtEmsVWMA6xkN2OIAn7OO
+uqwo78ivbJQlkhw0OdIHk
+O99A3QHr9N90rnMAob07F
+txbaBiIHaCLLsUXKDrSq7
+R9rRHMOw0xo6lPiNuGEvR
+m0WSQos5sBpAV8Ly0as2r
+RiOU0d40j97zJrsM2Fp4p
+O4eS5pcMtc1oQV2QrfZks
+Mbwr9rgI0l9VPN94DBTCt
+FJvEr6eekfesSbzn05HDb
+sgoT0kM8Y2tJtjN3P5qHY
+yBP4zokpvK0q2THIqfuq7
+ZM63v2dIzB49K7uBjDZzS
+MiMKdp0kXPCCowrvu8Wta
+zTTJQaruZ4Ax6P01pkzot
+Sr93rxdqmpRYasAG6b0mE
+mx2dYha4fPMHaCiw1opyT
+lrNv8M47N6kbqColxBqJp
+H1R45kQFp5O6WnicBqWEd
+OOIDRzQH2aPM9UjNLYQqM
+kmt4IPXgr8o3LvyBRunPL
+7ch6ZydwucHZOFv0oWPm2
+1xcq6INg3ZFMm5ni3SRYR
+gW4s9U61zObdGclUjCiBl
+NDoOEkjtswXb7MXU2QTzV
+ani8OdVOUoov9zETEHJ0Q
+kATp04a5tuCNmonVjQKki
+zQVKUmN0CLyfBMwmG1oAP
+H29xtvZYA2kWizaFP50De
+m6qSakOmTFwCz7nGzfFjY
+kGkYX8JvIwlt5KwlTJSRO
+SkziojYzbyZUNpm2c7Usn
+LbRYCRaptn0Dv6cUI6JEW
+tx2mGGX2xSwoYhO2mzgLm
+UomLg0xS3OhJH0kzGYM1n
+bnJC5h5FsjtrjqUn6V9Rf
+r92GFu3WUBUylVFU0dzDp
+Ir85ASOYEK02zq3UtJa2Y
+f3qqmUMOSIxqfKGJguRRb
+02HMmbH6ianW1svEU5QSp
+PRpjL0RfV0hOKQxU3ivql
+vMdyS3Sa1D2a7HAJtpYDA
+c6XOgxaigPgwzcaaa3EHo
+A4RbGYTZL640ejl4JyxlK
+pFdzvf9GW2n92viGU3aW1
+toS01Ff17Qiceu0OaJndB
+Mrm4hIx0CETskkHOmVG04foo
+foo
+foo
+foo

test.txt

@@ -1,30 +1,25 @@
-foo
-foo
-foo
-foo
-bar
-bar
-bar
-bar
-bar
-bar
-bar
-bar
-bar
-bar
-bar
-bar
-bar
-bla
-bla
-<<<<<<< HEAD
-bar
-bar
-bla
-=======
->>>>>>> parent of 73942cd (update)
-bla
-foo
-foo
-foo
-foo
+vZkkCxP
+jOyX5MfUP2APGkvcZu0sd
+VmtGAu1u3bAi30hMuJeUR
+CNIG7kHkTAQu0o6KUas4T
+RmzHQtJPJTuvI8QH8VOIQ
+nn5xo98ITRgqH0BqCHbUk
+7x2YxkpDo2PeVMWB6sswC
+di00j9sMYcqoQSlTsf51w
+CEtsGYR6uXKhvCK9rfIDV
+MnT9ILigOCI64P2QfC3UT
+i5C6msQnnAAjlytegVzed
+wVU0KBiFf33A9H4quY218
+7ef7gm5NGiosBWFeqNYGQ
+FUu1vA65Wbaiyuu2EvGJ6
+7ATmvdCiMGGNagp9MlSl8
+hsLNVMeSwgUyTT9dmklg2
+F3puUYJPJ1vW3pSJ4opbD
+tGS1IT19EURcJit6jVpZj
+NdYTR9lXgZLHiGYzHCwEe
+vn9kM0Fy1HT0k2eVd5YCF
+CCotQV6ZKOwh9Yi2qvKvP
+GdvkjljiIXLjzjikm1065
+YQr2rSF8JIhPkdNuiYoIT
+9pNUO6Ad9y8tD9qLE90gg
+joCwajmFmEG320KvHmlww

test/13XG4vc

@@ -0,0 +1 @@
+13XG4vc

test/5OzzvyW

@@ -0,0 +1 @@
+5OzzvyW

test/5fu7wL7

@@ -0,0 +1 @@
+5fu7wL7

test/HbYhLZd

@@ -0,0 +1 @@
+HbYhLZd

test/KhmbiHh

@@ -0,0 +1 @@
+KhmbiHh

test/MrRs3AP

@@ -0,0 +1 @@
+MrRs3AP

test/TTQ4vlZ

@@ -0,0 +1 @@
+TTQ4vlZ

test/WLUYiML

@@ -0,0 +1 @@
+WLUYiML

test/XsBnRqz

@@ -0,0 +1 @@
+XsBnRqz

test/bjKPqDO

@@ -0,0 +1 @@
+bjKPqDO

test/hXwso55

@@ -0,0 +1 @@
+hXwso55

test/lVZ0Piv

@@ -0,0 +1 @@
+lVZ0Piv

test/oM1YT8T

@@ -0,0 +1 @@
+oM1YT8T

test/q0adt0r

@@ -0,0 +1 @@
+q0adt0r

test/vYhJj04

@@ -0,0 +1 @@
+vYhJj04