OSDN Git Service

Fixed issue #163: Conflict "theirs" and "mine" are reversed during a rebase