Junio C Hamano c208e05bd9 Merge branch 'dg/local-mod-error-messages' ...

* dg/local-mod-error-messages:
  t7609-merge-co-error-msgs: test non-fast forward case too.
  Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
  setup_unpack_trees_porcelain: take the whole options struct as parameter
  Move set_porcelain_error_msgs to unpack-trees.c and rename it

Conflicts:
	merge-recursive.c

2010-09-03 22:23:49 -07:00

42 KiB

Raw Blame History

View Raw