diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
| commit | c208e05bd9880028c980fafbc5dda3d17a603ac1 (patch) | |
| tree | 25d587aacf885345b2b001bc006ac3871b5c7a4b /convert.c | |
| parent | Merge branch 'nd/maint-fix-replace' (diff) | |
| parent | t7609-merge-co-error-msgs: test non-fast forward case too. (diff) | |
| download | tgif-c208e05bd9880028c980fafbc5dda3d17a603ac1.tar.xz | |
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
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions