gg

Git like Mercurial

gg merge

gg merge [[-r] REV]

merge another revision into working directory

Options

-r rev
revision to merge
-abort
abort the ongoing merge