Mercurial > hg4j
annotate 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 |
rev | line source |
---|---|
609
e4a71afd3c71
Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
1 [section1] |
e4a71afd3c71
Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
2 key2 = alternative value 2 |
e4a71afd3c71
Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
3 |
e4a71afd3c71
Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
4 |
e4a71afd3c71
Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
5 [section2] |
e4a71afd3c71
Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
6 key1=value 1-2 # comment |