NAME

Git::Raw::Index::Conflict - Git index conflict class

VERSION

version 0.45

DESCRIPTION

A Git::Raw::Index::Conflict represents a conflict in a Git repository index.

WARNING: The API of this module is unstable and may change without warning (any change will be appropriately documented in the changelog).

METHODS

ours( )

Retrieve our side of the conflict. Returns a Git::Raw::Index::Entry object, or undef if not applicable.

ancestor( )

Retrieve the ancestor side of the conflict. Returns a Git::Raw::Index::Entry object, or undef if not applicable.

theirs( )

Retrieve their side of the conflict. Returns a Git::Raw::Index::Entry object, or undef if not applicable.

AUTHOR

Jacques Germishuys <jacquesg@striata.com>

LICENSE AND COPYRIGHT

Copyright 2014 Jacques Germishuys.

This program is free software; you can redistribute it and/or modify it under the terms of either: the GNU General Public License as published by the Free Software Foundation; or the Artistic License.

See http://dev.perl.org/licenses/ for more information.