merge-recursive implicitely depends on trust_executable_bit