Fix bug in merge subcommand

Signed-off-by: Jacob Stopak <jacob@initialcommit.io>

Author: initialcommit-io

git_sim/merge.py

@@ -156,6 +156,7 @@ def check_merge_conflict(self, branch1, branch2):
         repo_name = os.path.basename(self.repo.working_dir)
         new_dir = os.path.join(tempfile.gettempdir(), "git_sim", repo_name)
 
+        orig_repo = self.repo
         orig_remotes = self.repo.remotes
         self.repo = git.Repo.clone_from(git_root, new_dir, no_hardlinks=True)
         self.repo.git.checkout(branch2)
@@ -171,6 +172,7 @@ def check_merge_conflict(self, branch1, branch2):
                     if len(entry) == 2 and entry[1] > 0:
                         self.conflicted_files.append(entry[0])
             return 1, new_dir
+        self.repo = orig_repo
         return 0, new_dir
 
     # Override to display conflicted filenames