Allow git.checkout() to work on unmerged indexes

If the index has unmerged entries, the current checkout implementation
fails because of the -m option. This patch removes the option since it is
not needed on tree_id is specified. This also allows "stg status --reset"
to work on unmerged indexes.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>