Heya, On Mon, Aug 3, 2009 at 08:14, Michael Wild<themiwi@xxxxxxxxxxxxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html