Re: conflict status
From: Sverre Rabbelier <hidden>
Date: 2016-06-15 22:47:08
Heya, On Mon, Aug 3, 2009 at 08:14, Michael Wild[off-list ref] wrote:
Generally speaking, I would like to know for each file with a conflict what it's status is, similar to what SVN does: - locally modified/created/deleted/... - remotely modified/created/deleted/...
Try 'git status' :), -- Cheers, Sverre Rabbelier