summaryrefslogtreecommitdiff
path: root/t/t5515/refs.master_.._.git
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2010-08-11 10:38:06 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-11 10:36:05 -0700
commit08402b0409bc501deb97cf4388a78ee9f87092c6 (patch)
treec0b4207f0ae69970a21b4e94725d4318dc6ea6f5 /t/t5515/refs.master_.._.git
parentmerge-recursive: porcelain messages for checkout (diff)
downloadtgif-08402b0409bc501deb97cf4388a78ee9f87092c6.tar.xz
merge-recursive: distinguish "removed" and "overwritten" messages
To limit the number of possible error messages, the error messages for the case would_lose_untracked_file and would_lose_orphaned in unpack_trees_options.msgs were handled with a single string, parameterized by an action string ("overwritten" or "removed"). Instead, we consider them as two different cases, with unparameterized string. This will make it easier to make separate lists sorted by error types later. Only the bind_overlap case still takes two %s parameters, but that's unavoidable. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/refs.master_.._.git')
0 files changed, 0 insertions, 0 deletions