git-imerge, git-im: add

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