summaryrefslogtreecommitdiffstats
path: root/ini/ini.d/smerge.conf
Commit message (Collapse)AuthorAgeFilesLines
* New test files for section mergeDmitri Pal2012-04-051-0/+33
smerge.conf - test file sexpect.conf - file contains output of the smerge.conf processed in different merge modes for sections and values