https://stackoverflow.com/questions/2570087/how-to-abandon-a-hg-merge
Anonymous
Design for simplicity, add complexity only where you must.