2 commits

Author	SHA1	Message	Date
Marc Zinnschlag	904ad94952	added merge operation (doesn't do anything yet)	2015-08-13 12:03:20 +02:00
Marc Zinnschlag	b83f9445a9	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00