Add 'patience' to diff options for cleaner diff and merge
auto-strip white space in go files also