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 675304f77d19…

Parents 0fc6460b900b…

Parents b3eb281d9e93…

by Yuki KODAMA

Changes to 4 files · Browse files at 675304f77d19 Showing diff from parent 0fc6460b900b b3eb281d9e93 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​mergetools.ini Stacked
 
97
98
99
 
 
 
 
 
 
 
 
100
101
102
 
97
98
99
100
101
102
103
104
105
106
107
108
109
110
@@ -97,6 +97,14 @@
 ; These scripts fork processes, so the visual diff window must be used  docdiff.usewin=True   +; Windows only diff tools +rekisa.priority=-1 +rekisa.args = -Title=Base "$base" -Title=Local "$local" -Title=Other "$other" +rekisa.gui = True +rekisa.diffargs = "-Title=$plabel1" "$parent" "-Title=$clabel" "$child" +rekisa.diff3args = "-Title=$plabel1" "$parent1" "-Title=$clabel" "$child" "-Title=$plabel2" "$parent2" +rekisa.dirdiff = False +  ; Linux only diff tools, listed here for reference  bcompare.priority=-1  bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
Change 1 of 2 Show Entire File doc/​source/​faq.txt Stacked
 
120
121
122
123
 
124
125
126
 
148
149
150
 
 
151
152
153
 
120
121
122
 
123
124
125
126
 
148
149
150
151
152
153
154
155
@@ -120,7 +120,7 @@
  1. The Mercurial configuration system, which is three-tiered   1. Site-wide :file:`Mercurial.ini` in :file:`%ProgramFiles%\\TortoiseHg`   2. Per-User :file:`Mercurial.ini` in :file:`%UserProfile%` - 3. Per-Repository :file:`Mercurial.ini` in :file:`{repo-root}\.hg\hgrc` + 3. Per-Repository :file:`Mercurial.ini` in :file:`{repo-root}\\.hg\\hgrc`   2. :file:`%APPDATA%\\Tortoisehg` settings for application state   (window positions, etc)   @@ -148,6 +148,8 @@
  fontdiff = courier 10   # font used in file lists in status and commit tools   fontlist = courier 9 + # font used in command output window + fontlog = courier 10    *How do I switch GTK themes?*  
Change 1 of 1 Show Entire File doc/​source/​settings.txt Stacked
 
411
412
413
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
414
415
416
 
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
@@ -411,6 +411,42 @@
  Adjust the coloring style of diff lines in the changeset viewer.   Default: foreground.   + +.. module:: font.settings + :synopsis: Dialog used to set font specific preferences + +Font +---- + +:guilabel:`Theme default fonts` + Use default fonts based on current GTK theme. + +:guilabel:`Preset fonts:` + Select preset fonts from drop-down combo. These font sets are tuned + specifically for each language and/or environment. + +:guilabel:`Custom fonts:` + Set font names and sizes individually for each usage place. + +The group which contains drop-down combo entries under +:guilabel:`Custom fonts:` radio button is enabled when you activate it. + +:guilabel:`Commit Message:` + Font used in changeset viewer and commit log text. + Default: monospace 10. + +:guilabel:`Diff Text:` + Font used for diffs in status and commit tools. + Default: monospace 10. + +:guilabel:`File List:` + Font used in file lists in status and commit tools. + Default: sans 9. + +:guilabel:`Command Output:` + Font used in command output window. + Default: monospace 10. +  Removed this release  ====================  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​cslist.py Stacked
 
163
164
165
166
 
 
 
167
168
169
 
163
164
165
 
166
167
168
169
170
171
@@ -163,7 +163,9 @@
  contents=('%(item_l)s:', ' %(branch)s',   ' %(tags)s', ' %(summary)s'))   self.pstyle = csinfo.panelstyle( - contents=('item',) + csinfo.PANEL_DEFAULT[1:]) + contents=('item', 'summary', 'user','dateage', + 'rawbranch', 'tags', 'transplant', + 'p4', 'svn'))     # prepare to show   gtklib.idle_add_single_call(self.after_init)