Files - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

merge.py

stable merge, backout, qfold: use MessageEntry from its new location 4172a81623d1	Steve Borho Jul 5 11 at 4:29 PM
File not edited in 83 changesets including 2.1
Merge with stable f2f338aa6a61	André Sintzoff Jun 9 11 at 4:58 PM
merge: add empty subTitle when missing in CommitPage and ResultPage ecc1ad5db688	André Sintzoff Jun 9 11 at 4:48 PM
stable merge: add empty subTitle when missing in CommitPage 261f41836c4a	André Sintzoff Jun 9 11 at 4:50 PM
File not edited in 149 changesets
File not edited in 60 changesets including 2.0.5
Merge with stable a8d27ba47d50	Steve Borho May 4 11 at 9:15 PM
stable merge: prompt for a username if none defined before committing (closes #638) 1163436d43b1	André Sintzoff May 4 11 at 5:52 PM
File not edited in 33 changesets including 2.0.4
File not edited in 44 changesets
Merge with stable eafc8ffb4511	Steve Borho Apr 27 11 at 3:28 AM
File not edited in 25 changesets
stable merge: the outputLog widget is a member of cmdui.Core (fixes #617) a614b2251210	Steve Borho Apr 27 11 at 1:14 AM
File not edited in 38 changesets
status, commit: take a repo object like everyone else 8334a1ccdbd3	Steve Borho Apr 21 11 at 3:46 AM
merge: keep repo reference in QWizard for use by done() method 76d925893a37	Steve Borho Apr 21 11 at 3:23 AM
File not edited in 7 changesets
Merge with stable 5681789ce8a7	Steve Borho Apr 19 11 at 3:29 PM
stable merge: disconnect thgrepo signals at close b5e680aa4d23	Steve Borho Apr 19 11 at 3:25 PM
File not edited in 36 changesets
File not edited in 19 changesets
Merge with stable d9f1484734f9	Steve Borho Apr 12 11 at 7:45 PM
File not edited in 100 changesets
stable i18n: add context for 'Clean' 57224ab9877c	Wagner Bruna Apr 12 11 at 3:38 PM
File not edited in 22 changesets
Merge with stable (closes #509) 935e35c54094	Steve Borho Apr 3 11 at 4:45 PM
stable merge: respect cipushafter (refs #509) 754605a9f2b2	Steve Borho Apr 3 11 at 4:43 PM
merge: respect cipushafter (refs #509) 203127d8220c	Steve Borho Apr 3 11 at 4:39 PM
File not edited in 12 changesets
File not edited in 28 changesets including 2.0.3
Merge with stable c0110bb1099f	Steve Borho Mar 30 11 at 3:28 PM
stable merge: improve default merge message when merging named branches (closes #385) 343673de097e	Angel Ezquerra Mar 29 11 at 9:35 PM
File not edited in 8 changesets
File not edited in 93 changesets
merge: use a single QSettings instance to save commit page settings 801d3279c1c9	Steve Borho Mar 27 11 at 10:11 PM
merge: remove redundant page title change cff83b6292d8	Steve Borho Mar 27 11 at 10:09 PM
File not edited in 1 changeset
merge: show verbose output of merge command 3f6f376699c4	Steve Borho Mar 27 11 at 8:12 PM
File not edited in 7 changesets
merge: add togglebutton for skipping final confirmation page e81c7a838b32	Steve Borho Mar 27 11 at 3:16 AM
File not edited in 1 changeset
merge: add a checkbox for auto-advancing to the commit page a51b7122e2ce	Steve Borho Mar 27 11 at 2:12 AM
merge: establish minimum size, check command line args before starting 9b8daa20b2d6	Steve Borho Mar 26 11 at 6:52 PM
File not edited in 21 changesets
merge: fix a couple of egregious bugs 28eb10dbd0b8	Steve Borho Mar 22 11 at 3:45 AM
File not edited in 1 changeset
merge: tweaks for finish page 2555db019001	Steve Borho Mar 21 11 at 6:01 PM
File not edited in 2 changesets
merge: tweak options 69994110b0f4	Steve Borho Mar 20 11 at 6:58 PM
More Changesets...

Diff Options

Your session has expired