diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:26:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:26:46 -0700 |
| commit | 2eb54692d145a0c2939698302e913975f059ac34 (patch) | |
| tree | 88911c7cd362f52770bded7c03b73f32a7d8abb7 /builtin/diff-tree.c | |
| parent | Merge branch 'po/userdiff-csharp' (diff) | |
| parent | t7609: test merge and checkout error messages (diff) | |
| download | tgif-2eb54692d145a0c2939698302e913975f059ac34.tar.xz | |
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages:
t7609: test merge and checkout error messages
unpack_trees: group error messages by type
merge-recursive: distinguish "removed" and "overwritten" messages
merge-recursive: porcelain messages for checkout
Turn unpack_trees_options.msgs into an array + enum
Conflicts:
t/t3400-rebase.sh
Diffstat (limited to 'builtin/diff-tree.c')
0 files changed, 0 insertions, 0 deletions