Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

commit: clear file list if committing a merge

Changeset bf8534959ac2…

Parent 1605d49703e5…

by Steve Borho

Changes to one file · Browse files at bf8534959ac2 Showing diff from parent 1605d49703e5 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
464
465
466
 
 
467
468
469
 
464
465
466
467
468
469
470
471
@@ -464,6 +464,8 @@
  parent=self)   self.stwidget.tv.setFocus()   return + if len(repo.parents()) > 1: + files = []   user = self.usercombo.currentText()   self.addUsernameToHistory(user)   user = hglib.fromunicode(user, 'strict')