NAME

Dist::Zilla::Plugin::Git::CheckFor::MergeConflicts - Check your repo for merge-conflicted files

VERSION

This document describes version 0.013 of Dist::Zilla::Plugin::Git::CheckFor::MergeConflicts - released March 10, 2015 as part of Dist-Zilla-PluginBundle-Git-CheckFor.

SYNOPSIS

; in dist.ini
[Git::CheckFor::MergeConflicts]

DESCRIPTION

This is a simple Dist::Zilla plugin to check that the gathered files contain no merge conflict markers.

SEE ALSO

Please see those modules/websites for more information related to this module.

SOURCE

The development version is on github at http://https://github.com/RsrchBoy/dist-zilla-pluginbundle-git-checkfor and may be cloned from git://https://github.com/RsrchBoy/dist-zilla-pluginbundle-git-checkfor.git

BUGS

Please report any bugs or feature requests on the bugtracker website https://github.com/RsrchBoy/dist-zilla-pluginbundle-git-checkfor/issues

When submitting a bug or request, please include a test-file or a patch to an existing test-file that illustrates the bug or desired feature.

AUTHOR

Chris Weyl <cweyl@alumni.drew.edu>

I'm a material boy in a material world

Please note I do not expect to be gittip'ed or flattr'ed for this work, rather it is simply a very pleasant surprise. I largely create and release works like this because I need them or I find it enjoyable; however, don't let that stop you if you feel like it ;)

Flattr this, gittip me, or indulge my Amazon Wishlist... If you so desire.

COPYRIGHT AND LICENSE

This software is Copyright (c) 2012 by Chris Weyl.

This is free software, licensed under:

The GNU Lesser General Public License, Version 2.1, February 1999