/* ====================================================================
 * Copyright (c) 2003-2006, Martin Hauner
 *                          http://subcommander.tigris.org
 *
 * Subcommander is licensed as described in the file doc/COPYING, which
 * you should have received as part of this distribution.
 * ====================================================================
 */

#ifndef _CONFLICT_H
#define _CONFLICT_H

#include <vector>

class Conflict
{
public:
  Conflict() : _startLine(0), _number(0)
  {
  }

  Conflict( int line, int number )
    : _startLine(line), _number(number)
  {
  }

  int _startLine;
  int _number;
};

typedef std::vector<Conflict> DiffConflicts;

#endif // _CONFLICT_H

