got patch: don't loose the x bit when merging with diff3
treeea9adfa94a69f02c6bd221bb25d977f93cec3349
-rw-r--r-- 677 .cirrus.yml
drwxr-xr-x - .github
-rw-r--r-- 907 .gitignore
-rw-r--r-- 1812 CHANGELOG
-rw-r--r-- 47241 CHANGES
-rw-r--r-- 894 LICENCE
-rw-r--r-- 4379 Makefile.am
-rw-r--r-- 823 Makefile.common.in
-rw-r--r-- 685 Makefile.inc
-rw-r--r-- 6376 README
-rw-r--r-- 2097 README.portable
-rw-r--r-- 1181 TODO
-rwxr-xr-x 102 autogen.sh
drwxr-xr-x - compat
-rw-r--r-- 11102 configure.ac
-rw-r--r-- 6971 got-dist.txt
-rw-r--r-- 155 got-version.mk
drwxr-xr-x - got
drwxr-xr-x - gotadmin
drwxr-xr-x - gotweb
drwxr-xr-x - include
drwxr-xr-x - lib
drwxr-xr-x - libexec
drwxr-xr-x - regress
drwxr-xr-x - tog
drwxr-xr-x - util