Stop merging master

`git-vee`

I have a script for comparing branches with the rebased versions

The command git vee topic topic-rebased produces this:

        = e03d8a2 (topic-rebased) more changes to files named a
        = 2713271 more a files
        = 95536a3 add some files named a
        * c34f8b9 (master) replace c with c2 and c3
        * 769e6ad work on b files
        | = 2802301 (HEAD, topic) more changes to files named a
        | = 4cf89e7 more a files
        | = 1c1bb18 add some files named a
        |/
        o 2f9d24e add a, b, and c

It shows the V-shaped history of both branches

back to the latest common ancestor

= marks commits that are the same in both branches

* marks commits that are not in both branches

It's in ~mjd/bin/git-vee on dev if you want to try it