summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff-tree_--patch-with-stat_initial
diff options
context:
space:
mode:
authorLibravatar Diane Gasselin <diane.gasselin@ensimag.imag.fr>2010-08-11 10:38:05 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-11 10:36:03 -0700
commit23cbf11b5c08c6d0ab0fd0d6f2dc5a32ca31c745 (patch)
tree61c94915e74e7118388bcc5bb1422eadf2a83bfe /t/t4013/diff.diff-tree_--patch-with-stat_initial
parentTurn unpack_trees_options.msgs into an array + enum (diff)
downloadtgif-23cbf11b5c08c6d0ab0fd0d6f2dc5a32ca31c745.tar.xz
merge-recursive: porcelain messages for checkout
A porcelain message was first added in checkout.c in the commit 8ccba008 (Junio C Hamano, Sat May 17 21:03:49 2008, unpack-trees: allow Porcelain to give different error messages) to give better feedback in the case of merge errors. This patch adapts the porcelain messages for the case of checkout instead. This way, when having a checkout error, "merge" no longer appears in the error message. While we're there, we add an advice in the case of would_lose_untracked_file. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff-tree_--patch-with-stat_initial')
0 files changed, 0 insertions, 0 deletions