NO_TRIVIAL         72 builtin/merge.c 	{ "recursive",  DEFAULT_TWOHEAD | NO_TRIVIAL },
NO_TRIVIAL         75 builtin/merge.c 	{ "ours",       NO_FAST_FORWARD | NO_TRIVIAL },
NO_TRIVIAL         76 builtin/merge.c 	{ "subtree",    NO_FAST_FORWARD | NO_TRIVIAL },
NO_TRIVIAL        153 builtin/merge.c 	ret->attr = NO_TRIVIAL;
NO_TRIVIAL       1383 builtin/merge.c 		if (use_strategies[i]->attr & NO_TRIVIAL)