Index of /contributions/modules/conflict_resolver

File		Rev.	Age	Author	Last log entry
Parent Directory
engines/
README.txt		1.2	3 months	bradfordcp	Snapshot of the code during the final day of Google Summer of Code. Automatic re...
conflict_resolver.admin.inc		1.1	5 months	bradfordcp	Began work on pluggable back-end system for separate diff engines
conflict_resolver.info		1.1	5 months	bradfordcp	Began work on pluggable back-end system for separate diff engines
conflict_resolver.install		1.1	5 months	bradfordcp	Added the .install file to create the conflict resolutions table
conflict_resolver.module		1.6	3 months	bradfordcp	Snapshot of the code during the final day of Google Summer of Code. Automatic re...