Test merge/rebase with existing local commit

Signed-off-by: Michal Čihař <michal@cihar.com>

weblate/trans/tests/test_vcs.py

@@ -72,6 +72,14 @@ class VCSGitTest(RepoTestCase):
         self.repo.reset(self._branch)
         self.assertEqual(original, self.repo.last_revision)
 
+    def test_merge_commit(self):
+        self.test_commit()
+        self.test_merge()
+
+    def test_rebase_nothing(self):
+        self.test_commit()
+        self.test_rebase()
+
     def test_merge(self):
         self.repo.merge(self._branch)