Merge branch 'jc/merge-symlink-ours-theirs'

diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh
index 68dd0f080e88983a1be250ed2e4c9f9d8cf144f2..fe4ee4e06b1e33d3ee1cd9022df06c960dd8d75b 100755 (executable)
--- a/ci/run-static-analysis.sh
+++ b/ci/run-static-analysis.sh
@@ -6,3 +6,5 @@
 . ${0%/*}/lib-travisci.sh
 
 make coccicheck
+
+save_good_tree