diff options
| author |  Diane Gasselin <diane.gasselin@ensimag.imag.fr> | 2010-08-11 10:38:08 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-11 10:36:08 -0700 |
| commit | e935e62a0fd26ff1f29a98a4ca8fa693f42357a2 (patch) | |
| tree | cc4172939dd0b528c79506784f9b3f7a4cceff5d /builtin/merge.c | |
| parent | unpack_trees: group error messages by type (diff) | |
| download | tgif-e935e62a0fd26ff1f29a98a4ca8fa693f42357a2.tar.xz | |
t7609: test merge and checkout error messages
Test porcelain and plumbing error messages for different types of errors
of merge and checkout.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions