From: Luben Tuikov <ltuikov@yahoo.com>
Date: Fri, 02 Dec 2005 00:07:15 GMT
Subject: Re: resolve (merge) problems
Message-ID: <20051202000715.8100.qmail@web31810.mail.mud.yahoo.com>
In-Reply-To: <7v3blccqtz.fsf@assigned-by-dhcp.cox.net>

--- Junio C Hamano <junkio@cox.net> wrote:
> Easier to read is:
> 
> 	$ git-diff-files --name-status

Ok this is what it shows:

$git-diff-files --name-status
U       arch/arm/configs/poodle_defconfig
D       arch/arm/configs/poodle_defconfig
U       drivers/atm/atmdev_init.c
D       drivers/atm/atmdev_init.c

Unmerged and deleted?  Is this correct?

    Luben