drupalcode.org Git - project/conflict_resolver.git/summary

projects / project/conflict_resolver.git / summary

summary | shortlog | log | commit | commitdiff | tree

description	For more information about this repository, visit the project page at http://drupal.org/project/conflict_resolver
owner	drupal-git
last change	Fri, 25 Feb 2011 02:11:04 +0000

2011-02-25	The Great Git...	Stripping CVS keywords master	commit \| commitdiff \| tree \| snapshot
2009-08-24	Christopher...	Snapshot of the code during the final day of Google...	commit \| commitdiff \| tree \| snapshot
2009-08-01	Christopher...	Almost finished automatic resolution (CCK needs to...	commit \| commitdiff \| tree \| snapshot
2009-06-21	Christopher...	First attempt at merging title, body, and CCK fields...	commit \| commitdiff \| tree \| snapshot
2009-06-17	Christopher...	Added the .install file to create the conflict resoluti...	commit \| commitdiff \| tree \| snapshot
2009-06-17	Christopher...	UNSTABLE: The code in its current state will cause...	commit \| commitdiff \| tree \| snapshot
2009-06-11	Christopher...	Generating a listing of nodes with conflicts. Currently...	commit \| commitdiff \| tree \| snapshot
2009-06-09	Christopher...	Fixed merging issues, moving on to identifying conflict...	commit \| commitdiff \| tree \| snapshot
2009-06-08	Christopher...	Updates to the system engine to generate a merged outpu...	commit \| commitdiff \| tree \| snapshot
2009-06-02	Christopher...	Began work on pluggable back-end system for separate...	commit \| commitdiff \| tree \| snapshot
2009-05-24	Christopher...	Adding project to CVS as per SoC instructions on g.d.o	commit \| commitdiff \| tree \| snapshot

14 months ago	6.x-1.x	shortlog \| log \| tree
14 months ago	master	shortlog \| log \| tree

Cache Last Updated: Wed May 23 00:11:06 2012 GMT

For more information about this repository, visit the project page at http://drupal.org/project/conflict_resolver