Steve Borho avatar Steve Borho committed ce46592

history: allow merges even when repo has one head

Comments (0)

Files changed (1)

         # disable/enable menus as required
         parents = [self.repo.changelog.rev(x.node()) for x in
                    self.repo.changectx(None).parents()]
-        can_merge = selrev not in parents and \
-                    len(self.repo.heads()) > 1 and \
-                    len(parents) < 2
+        can_merge = selrev not in parents and len(parents) < 2
         self._cmenu_merge.set_sensitive(can_merge)
 
         # display the context menu
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.