Commit fef7558c924fa321bf96f56c982bccd423408d15

William Pitcock 2012-05-11T20:54:37

main: add --ignore-conflicts program option (issue #13)