Added more on undoing merges to my recent post on Git