Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

update: do not restrict merging across named branches

Changeset f9858b62b9a6…

Parent d9e4d2976b56…

by Wagner Bruna

Changes to one file · Browse files at f9858b62b9a6 Showing diff from parent d9e4d2976b56 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​update.py Stacked
 
212
213
214
215
216
 
217
218
219
 
212
213
214
 
 
215
216
217
218
@@ -212,8 +212,7 @@
  if clean is None:   clean = isclean()   pa = p1.ancestor(p2) - return not clean and p1.branch() == p2.branch() and \ - (p1 == pa or p2 == pa) + return not clean and (p1 == pa or p2 == pa)   def confirmupdate(clean=None):   if clean is None:   clean = isclean()