conflict.rb
Path:
lib/vcs/conflict.rb
Last Update:
Sat Feb 18 15:07:11 CET 2006
Copyright:
Copyright © 2004, 2005 LRDE. All rights reserved.
Author:
Nicolas Pouillard <ertai@lrde.epita.fr>.
License:
Gnu General Public License.
Revision:
$Id$
[Validate]