merge-recursive: distinguish "removed" and "overwritten" messages
commit08402b0409bc501deb97cf4388a78ee9f87092c6
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Wed, 11 Aug 2010 08:38:06 +0000 (11 10:38 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2010 17:36:05 +0000 (11 10:36 -0700)
treec0b4207f0ae69970a21b4e94725d4318dc6ea6f5
parent23cbf11b5c08c6d0ab0fd0d6f2dc5a32ca31c745
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>
merge-recursive.c
unpack-trees.c
unpack-trees.h