diff src/org/tmatesoft/hg/internal/ConfigFile.java @ 705:b4242b7e7dfe

Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200 (2013-08-15)
parents 6526d8adbc0f
children
line wrap: on
line diff