Do not merge comments on file upload

4ff5f505 · Michal Čihař · a89f2f8c · 4ff5f505
Commit 4ff5f505 authored Mar 13, 2012 by Michal Čihař
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

trans/models.py trans/models.py +1 -1

No files found.
--- a/trans/models.py
+++ b/trans/models.py
@@ -433,7 +433,7 @@ class Translation(models.Model):
                if not mergefuzzy:
                    if unit2.isfuzzy():
                        continue
-                unit1.merge(unit2, overwrite=overwrite)
+                unit1.merge(unit2, overwrite=overwrite, comments=False)
        store1.save()
        ret = self.git_commit(author)
        self.check_sync()