![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 4 Sep 2010 05:23:49 +0000 (22:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 4 Sep 2010 05:23:49 +0000 (22:23 -0700) | ||
| commit | c208e05bd9880028c980fafbc5dda3d17a603ac1 | |
| tree | 25d587aacf885345b2b001bc006ac3871b5c7a4b | tree | snapshot |
| parent | f92d62ec4ead67109418483b65aaf158b7462121 | commit | diff |
| parent | c5978a507ca20b12008724f78237784193fb9489 | commit | diff |
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
* 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
| builtin/checkout.c | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | diff2 | | blob | history |
| merge-recursive.h | diff1 | | diff2 | | blob | history |
| unpack-trees.c | diff1 | | diff2 | | blob | history |