Commit 4321595dcb83131675c7b38ac7fec8337476026e

Patrick Steinhardt 2015-11-10T16:54:48

worktree: test basic merge functionality