OSDN Git Service

Fix issue #1696: 3-way compare does not properly align identical lines when resolving...