Files - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

resolve.py

Merge with stable 6fa25cb9ee01	Steve Borho Apr 19 11 at 4:51 PM
stable resolve: disconnect thgrepo signals at close 561d4b61ce72	Steve Borho Apr 19 11 at 4:29 PM
File not edited in 78 changesets including 2.0.3
File not edited in 154 changesets
Merge with stable fa4af62c8e59	Steve Borho Mar 29 11 at 7:26 PM
File not edited in 50 changesets
stable resolve: show info about the "local" and "other" revisions (closes #458) 4862de17b8dd	Angel Ezquerra Mar 29 11 at 4:12 PM
File not edited in 69 changesets
Merge with stable a2b311fa5405	Steve Borho Mar 20 11 at 6:16 PM
stable resolve: improve button names (closes #81) 7c905f0daee9	Steve Borho Mar 20 11 at 6:03 PM
File not edited in 51 changesets
File not edited in 99 changesets including 2.0.2 and 2.0.1
resolve: use qtlib.editfiles f5eb5cbd6a6a	Steve Borho Mar 13 11 at 4:29 PM
File not edited in 25 changesets
stable resolve: use Exit instead of Quit - at least on Windows 3e3cb9cd4027	timeless Mar 4 11 at 8:53 AM
File not edited in 38 changesets
stable resolve: use QUrl.fromLocalFile() to drag local files 658a0bdb8440	Steve Borho Mar 7 11 at 12:06 AM
File not edited in 83 changesets
File not edited in 89 changesets including 2.0
stable resovlve: fix file drag behavior (closes #160) c1347a5cac8a	Steve Borho Feb 28 11 at 12:30 AM
File not edited in 43 changesets
stable resolve: give a warning about subrepo visual diffs 2d695b7d49fd	Steve Borho Feb 27 11 at 4:18 PM
File not edited in 44 changesets
stable resolve: teach resolve tool about subrepos dd43e9bae451	Steve Borho Feb 26 11 at 6:09 PM
File not edited in 52 changesets
stable cmdui: give Widget three mandatory parameters 29caeb413598	Steve Borho Feb 25 11 at 5:50 AM
File not edited in 188 changesets including 1.9.3
stable resolve: use standard refresh toolbar button 28569a2965d3	Steve Borho Feb 17 11 at 1:19 AM
File not edited in 45 changesets
stable resolve: use simpler p1() and p2() revision sets 37bccbc32810	Steve Borho Feb 13 11 at 9:57 PM
File not edited in 2 changesets
stable icons: move most hg/thg-specific icons to be xdg-theme-like structure f757843e8eb3	Yuya Nishihara Feb 13 11 at 4:59 PM
File not edited in 108 changesets
stable resolve: use functioning revision sets 6f0165b7f202	Steve Borho Feb 6 11 at 6:25 PM
File not edited in 259 changesets including 1.9.2
cmdui: rename show_output() to setShowOutput() 5c476de947b4	Steve Borho Jan 21 11 at 8:03 PM
File not edited in 146 changesets
resovle: use revision sets to define visual diff arguments 062156e6ed3e	Steve Borho Jan 6 11 at 4:20 AM
File not edited in 321 changesets including 1.9.1 and 1.9
visdiff: callers of visualdiff need to handle a dialog returned 6e320e14e2e0	Steve Borho Nov 24 10 at 4:46 AM
File not edited in 3 changesets
resolve: use selectionModel.hasSelection() to toggle button sensitivity 246156bf372e	Steve Borho Nov 24 10 at 12:45 AM
resolve: white-space cleanup 46d280533199	Steve Borho Nov 24 10 at 12:26 AM
File not edited in 104 changesets
resolve: fix path drag URL creation 79642b1bcfc1	Steve Borho Nov 12 10 at 10:20 PM
resolve: auto-resolve should attempt to resolve all files 89ed9db591b2	James McKay Nov 10 10 at 11:06 PM
File not edited in 43 changesets
resolve: cleanup parent hierarchy d397bbaff0e1	Steve Borho Nov 5 10 at 3:23 AM
File not edited in 117 changesets
resolve: use consistent names for local/other 8e2d16b27395	Steve Borho Oct 26 10 at 4:04 PM
More Changesets...

Diff Options

Your session has expired