merge of patch lists started
merge many
darcs conflicts
move Darcs description to separate file
stubs for Git and Camp added