diff options
author | Dmitri Pal <dpal@redhat.com> | 2010-12-26 00:15:12 -0500 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-04-05 11:20:08 -0700 |
commit | c631e86ab3cd0b9284c4d1c40c8834b4677939dd (patch) | |
tree | e4b5ecd2625e7e4755eaf6c2083598aa58948475 /.gitignore | |
parent | d34f8dd6d9d6888da3e1535233196d41aa403d72 (diff) | |
download | ding-libs-c631e86ab3cd0b9284c4d1c40c8834b4677939dd.tar.gz ding-libs-c631e86ab3cd0b9284c4d1c40c8834b4677939dd.tar.xz ding-libs-c631e86ab3cd0b9284c4d1c40c8834b4677939dd.zip |
New test files for section merge
smerge.conf - test file
sexpect.conf - file contains output of the smerge.conf
processed in different merge modes
for sections and values
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions