view test-data/included.rc @ 705:b4242b7e7dfe

Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200
parents e4a71afd3c71
children
line wrap: on
line source
[section1]
key2 = alternative value 2


[section2]
key1=value 1-2 # comment