Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable merge: Fix a typo in the "already merged" warning message.

Changeset cb9625adc167…

Parent 79a5b5077fa4…

by Daniel Atallah

Changes to one file · Browse files at cb9625adc167 Showing diff from parent 79a5b5077fa4 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
274
275
276
277
 
278
279
280
 
274
275
276
 
277
278
279
280
@@ -274,7 +274,7 @@
  wdbox.addWidget(wd_detail)   wdbox.addSpacing(4)   - wd_merged = QLabel(_('The workding directory is already <b>merged</b>. ' + wd_merged = QLabel(_('The working directory is already <b>merged</b>. '   '<a href="skip"><b>Continue</b></a> or '   '<a href="discard"><b>discard</b></a> existing '   'merge.'))