Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 2548df5279b6…

Parents 6de6196eaa83…

Parents fd10e47d36b9…

by Steve Borho

Changes to 3 files · Browse files at 2548df5279b6 Showing diff from parent 6de6196eaa83 fd10e47d36b9 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​setup.cfg Stacked
 
3
4
5
6
 
 
3
4
5
 
6
@@ -3,4 +3,4 @@
 includes=cairo, pango, pangocairo, atk, gobject, dbhash, gtk.keysyms, gio  packages=ctypes, email, hgext, hgext.convert, encodings, tortoisehg.hgtk, tortoisehg.hgtk.logview, tortoisehg.util, iniparse, pygments, dulwich   -dll_excludes=iconv.dll, intl.dll, libatk-1.0-0.dll, libgdk_pixbuf-2.0-0.dll, libgdk-win32-2.0-0.dll, libglib-2.0-0.dll, libgmodule-2.0-0.dll, libgobject-2.0-0.dll, libgthread-2.0-0.dll, libgtk-win32-2.0-0.dll, libpango-1.0-0.dll, libpangowin32-1.0-0.dll, libcairo-2.dll, libglade-2.0-0.dll, libpangocairo-1.0-0.dll, libpangoft2-1.0-0.dll, libgio-2.0-0.dll, mswsock.dll, powrprof.dll, shfolder.dll, credui.dll, msvcp60.dll +dll_excludes=iconv.dll, intl.dll, libatk-1.0-0.dll, libgdk_pixbuf-2.0-0.dll, libgdk-win32-2.0-0.dll, libglib-2.0-0.dll, libgmodule-2.0-0.dll, libgobject-2.0-0.dll, libgthread-2.0-0.dll, libgtk-win32-2.0-0.dll, libpango-1.0-0.dll, libpangowin32-1.0-0.dll, libcairo-2.dll, libglade-2.0-0.dll, libpangocairo-1.0-0.dll, libpangoft2-1.0-0.dll, libgio-2.0-0.dll, mswsock.dll, powrprof.dll, shfolder.dll, credui.dll, msvcp60.dll, secur32.dll
Change 1 of 1 Show Entire File doc/​source/​settings.txt Stacked
 
381
382
383
384
 
 
385
386
387
 
381
382
383
 
384
385
386
387
388
@@ -381,7 +381,8 @@
   :guilabel:`Patch EOL:`   Normalize file line endings during and after patch to lf or crlf. - Strict does no normalization. Default: strict + Strict does no normalization. Auto (introduced in hg 1.5) does + per-file detection and is the recommended setting. Default: strict    :guilabel:`Git Format:`   Use git extended diff header format.
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​thgconfig.py Stacked
 
243
244
245
246
 
247
248
 
 
249
250
251
 
243
244
245
 
246
247
 
248
249
250
251
252
@@ -243,9 +243,10 @@
  )),    ({'name': 'diff', 'label': _('Diff'), 'icon': gtk.STOCK_JUSTIFY_FILL}, ( - (_('Patch EOL'), 'patch.eol', ['strict', 'crlf', 'lf'], + (_('Patch EOL'), 'patch.eol', ['auto', 'strict', 'crlf', 'lf'],   _('Normalize file line endings during and after patch to lf or' - ' crlf. Strict does no normalization.' + ' crlf. Strict does no normalization. Auto does per-file' + ' detection, and is the recommended setting.'   ' Default: strict')),   (_('Git Format'), 'diff.git', ['False', 'True'],   _('Use git extended diff header format.'