Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | New test files for section merge | Dmitri Pal | 2012-04-05 | 1 | -0/+33 |
smerge.conf - test file sexpect.conf - file contains output of the smerge.conf processed in different merge modes for sections and values |