| Sat, 12 Apr 2008 21:34:01 +0200 |
Patrick Mezard |
Merge with crew-stable
|
| Sat, 12 Apr 2008 20:03:54 +0200 |
Dirkjan Ochtman |
remove trailing whitespace introduced in cfeeac24fc1e
|
| Sat, 12 Apr 2008 06:37:38 +0300 |
Giorgos Keramidas |
templates/coal: spell class correctly in {fileentry}
|
| Fri, 11 Apr 2008 22:19:52 -0700 |
Bryan O'Sullivan |
repo: add rjoin method
|
| Fri, 11 Apr 2008 22:19:51 -0700 |
Bryan O'Sullivan |
parseurl: make revs optional
|
| Fri, 11 Apr 2008 22:18:38 -0700 |
Bryan O'Sullivan |
Hoist localpath to the top level
|
| Fri, 11 Apr 2008 22:17:20 -0700 |
Bryan O'Sullivan |
test-imerge: disable due to massive brokenness
|
| Fri, 04 Apr 2008 02:21:53 +0300 |
Dov Feldstern |
use internal merge tool when specified for a merge-pattern in hgrc
|
| Fri, 04 Apr 2008 02:20:58 +0300 |
Dov Feldstern |
test that internal merge tools are used when set for a merge-pattern in hgrc
|
| Sat, 12 Apr 2008 22:41:07 -0400 |
Benoit Boissinot |
fix import with -p0
|
| Sat, 12 Apr 2008 21:08:03 +0200 |
Patrick Mezard |
context: handle untracked files in filectx.fileflags()
|
| Fri, 11 Apr 2008 12:52:56 -0500 |
Matt Mackall |
resolve: new command
|
| Fri, 11 Apr 2008 12:04:26 +0200 |
Dirkjan Ochtman |
python-2.6: use sha wrapper from util for new merge code
|
| Fri, 11 Apr 2008 09:27:28 +0200 |
Adrian Buehlmann |
fixed missing sorting in test-dumprevlog
|
| Fri, 11 Apr 2008 11:21:55 +0200 |
Patrick Mezard |
test-dumprevlog: fix extra path separator under MacOSX
|
| Fri, 11 Apr 2008 08:35:37 +0200 |
Dirkjan Ochtman |
Merge from main.
|
