uDIG

Replace merge tool with merge operation and merge view