gbdiff - bash function to get handy branches diff.
Conflicts resolved