summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorDmitri Pal <dpal@redhat.com>2010-12-26 00:10:23 -0500
committerStephen Gallagher <sgallagh@redhat.com>2012-04-05 11:20:08 -0700
commitd34f8dd6d9d6888da3e1535233196d41aa403d72 (patch)
tree825251e94681710706fbad858b6cd5d4e20b23bc /Makefile.am
parent21ebb86b27e2052f8388f38b92eea552a7919619 (diff)
downloadding-libs-d34f8dd6d9d6888da3e1535233196d41aa403d72.tar.gz
ding-libs-d34f8dd6d9d6888da3e1535233196d41aa403d72.tar.xz
ding-libs-d34f8dd6d9d6888da3e1535233196d41aa403d72.zip
Return error in DETECT mode
If in merge DETECT mode and there were no parsing errors return error if there were merge collisions.
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions