OSDN Git Service

Add Resolve "Their" and Resolve "Mine" at conflict item.