Add Michael Haggerty's git-imerge, to play with it more

Signed-off-by: Christopher Larson <kergoth@gmail.com>