Show Mercurial 5.3.1 conflict

glaure · Aug 13, 2021 · 6f33850 · 6f33850
1 parent 6dcb75c
commit 6f33850
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -129,4 +129,5 @@ dmypy.json
 .pyre/
 
 # subrepo
-thg/
+thg/
+core
diff --git a/core b/core
diff --git a/packaging/Ubuntu2004/debian/control b/packaging/Ubuntu2004/debian/control
@@ -19,6 +19,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
                 python3-pyqt5.qsci,
                 python-is-python3,
                 python3-iniparse
+Conflicts: mercurial (<5.8.1)
 Description: Graphical tool for working with mercurial
  TortoiseHg provides a graphical tool for interacting with the distributed
  revision control system Mercurial.  GUI support is provided for over a
-Original file line number
+Diff line change
@@ Expand Up / @@ -129,4 +129,5 @@ dmypy.json @@
     .pyre/
     # subrepo
-    thg/
+    thg/
+    core