Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

merge: show verbose output of merge command

A poor man's progress bar

Changeset 3f6f376699c4…

Parent 49a1f6f23572…

by Steve Borho

Changes to one file · Browse files at 3f6f376699c4 Showing diff from parent 49a1f6f23572 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
360
361
362
363
 
364
365
366
 
360
361
362
 
363
364
365
366
@@ -360,7 +360,7 @@
  cmdline = ['--repository', self.repo.root, 'debugsetparents',   '.', self.wizard().otherrev]   else: - cmdline = ['--repository', self.repo.root, 'merge'] + cmdline = ['--repository', self.repo.root, 'merge', '--verbose']   if self.field('force').toBool():   cmdline.append('--force')   tool = self.field('autoresolve').toBool() and 'merge' or 'fail'