This is the complete list of members for ConflictData, including all inherited members.

filename	ConflictData
our_commit_time	ConflictData
our_oid	ConflictData
our_status	ConflictData
their_commit_time	ConflictData
their_oid	ConflictData
their_status	ConflictData
use_ours	ConflictData