Use the "patience" diff algorithm.

Also, remove the old 'sync' alias and normalize whitespace.