add_strategies   1375 builtin/merge.c 			add_strategies(pull_twohead, DEFAULT_TWOHEAD);
add_strategies   1377 builtin/merge.c 			add_strategies(pull_octopus, DEFAULT_OCTOPUS);