fixed merge branch diffing.
(vimgitlog.master - total: @1h21 commit: @15min)