![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:26:46 +0000 (23:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:26:46 +0000 (23:26 -0700) | ||
| commit | 2eb54692d145a0c2939698302e913975f059ac34 | |
| tree | 88911c7cd362f52770bded7c03b73f32a7d8abb7 | tree | snapshot |
| parent | a0b6a9d2b2b0667bc170c864a05b3ec4635a71bb | commit | diff |
| parent | e935e62a0fd26ff1f29a98a4ca8fa693f42357a2 | commit | diff |
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
* 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
| builtin/checkout.c | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | diff2 | | blob | history |
| t/t3400-rebase.sh | diff1 | | diff2 | | blob | history |
| t/t3404-rebase-interactive.sh | diff1 | | diff2 | | blob | history |
| unpack-trees.c | diff1 | | diff2 | | blob | history |