Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.1, 0.8.2, and 0.8.3

commit: only overwrite merge commit message if unmodified

Fixes #408

Changeset 45ac7a754d90…

Parent 1b22fb916675…

by Steve Borho

Changes to one file · Browse files at 45ac7a754d90 Showing diff from parent 1b22fb916675 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​commit.py Stacked
 
353
354
355
356
 
357
358
359
 
 
 
360
361
362
 
353
354
355
 
356
357
 
 
358
359
360
361
362
363
@@ -353,10 +353,11 @@
  entry[FM_CHECKED] = True   self.update_check_count()   - # pre-fill commit message + # pre-fill commit message, if not modified   buf = self.text.get_buffer() - buf.set_text(_('merge')) - buf.set_modified(False) + if not buf.get_modified(): + buf.set_text(_('merge')) + buf.set_modified(False)       def check_patch_queue(self):