ls-files: --others should not say unmerged paths are unknown.
authorJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 01:26:31 +0000 (17:26 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 7 Nov 2005 01:26:31 +0000 (17:26 -0800)
commitfcbc3083e37f3c025d85d7b2c8a1c53d07a81fac
tree49ac95e5ebfd28b32ec1a23a0982900426f0c06c
parent0cfddacdcca229deca9a1dcdf8628bf168171908
ls-files: --others should not say unmerged paths are unknown.

Jon Loeliger noticed that an unmerged path appears as
"Untracked" in git-status output, even though we show the same
path as updated/changed.  Since --others means "we have not told
git about that path", we should not show unmerged paths --
obviously, git knows about them; it just does not know what we
want to do about them yet.

Signed-off-by: Junio C Hamano <junkio@cox.net>
ls-files.c