merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / ci /
drwxr-xr-x   parent (dest: ; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-rwxr-xr-x 1211 install-dependencies.sh
-rwxr-xr-x 4082 lib-travisci.sh
-rwxr-xr-x 2296 print-test-failures.sh
-rwxr-xr-x 375 run-build-and-tests.sh
-rwxr-xr-x 1712 run-linux32-build.sh
-rwxr-xr-x 802 run-linux32-docker.sh
-rwxr-xr-x 489 run-static-analysis.sh
-rwxr-xr-x 2793 run-windows-build.sh
-rwxr-xr-x 866 test-documentation.sh
drwxr-xr-x - util