Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable doc: fix typo in patches.txt and whatsnew.txt

Changeset 611866546663…

Parent fb31b90b83ab…

by André Sintzoff

Changes to 2 files · Browse files at 611866546663 Showing diff from parent fb31b90b83ab Diff from another changeset...

Change 1 of 2 Show Entire File doc/​source/​patches.txt Stacked
 
180
181
182
183
 
184
185
186
 
197
198
199
200
 
201
202
203
 
180
181
182
 
183
184
185
186
 
197
198
199
 
200
201
202
203
@@ -180,7 +180,7 @@
 Patch Rejects  =============   -As explained previously, patches are not guarunteed to apply cleanly to +As explained previously, patches are not guaranteed to apply cleanly to  their intended source files. Prior to TortoiseHg 2.0, the only recourse  available when patch chunks were rejected was to open the source file  and the rejects file in an editor and manually fixup the rejected @@ -197,7 +197,7 @@
  Resolve rejected patch chunks    The rejects editor is very basic. Your source file is opened in a -Qscintilla2 window for edit. Below the source file is the list of +QScintilla2 window for edit. Below the source file is the list of  chunks that failed to apply to this file. When you click on a chunk in  the list the editor jumps to the line where the chunk context was  supposed to match. It is up to you to figure out why the chunk did not
Change 1 of 1 Show Entire File doc/​source/​whatsnew.txt Stacked
 
109
110
111
112
 
113
114
115
 
109
110
111
 
112
113
114
115
@@ -109,7 +109,7 @@
 * edit commit messages with auto-completion of filenames and source symbols  * edit revision set strings with brace matching and auto-completion   -One can configure the Qscintilla2 tab stop parameter using the settings +One can configure the QScintilla2 tab stop parameter using the settings  tool, while white space visibility and wrap are controlled by context  menus.