tree 7555880533d83bd44d1a57f3695d04721f02457e
parent 298f2e2111905388e3d10cd0db0221a22dc7a62f
author Mirko Nosenzo <netnose@gmail.com> 1464525457 +0200
committer Mirko Nosenzo <netnose@gmail.com> 1464526877 +0200

StatusConflicted maps GIT_STATUS_CONFLICTED

Added support for file in conflicted status