Martian questions

Martian answers

• Combining merges into a single merge
• vim undo limited to one step on some hosts
• Maintain different directory structure in different git branches