Mercurial > hg4j
view test-data/sample.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] # comment key1=value 1 key2=value 2 key3=value 3#comment %include ./included.rc [section3] key1=value 1-3 [section1] key4=value 4 %unset key1