Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 28 Apr 2007 17:55:45 -0300] rev 4387
run-tests.py: pass -L/--label to simplemerge
This should give us conflict markers that don't change from one run
to another.
Remove some sed's/egrep's from some tests.
Lee Cantey <lcantey@gmail.com> [Thu, 26 Apr 2007 23:58:18 -0700] rev 4386
Add notes about configuring a merge program
Lee Cantey <lcantey@gmail.com> [Fri, 27 Apr 2007 16:04:17 -0700] rev 4385
Update copyright year and change to range
Patrick Mezard <pmezard@gmail.com> [Sat, 28 Apr 2007 11:53:36 +0200] rev 4384
Use patch.patch() when checking for patch availability.
The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.
Brendan Cully <brendan@kublai.com> [Sat, 28 Apr 2007 09:03:47 -0700] rev 4383
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Sat, 28 Apr 2007 11:43:31 +0200] rev 4382
Fix find_in_path not including some file extension logic under win32.
Windows shell resolves utility path by combining PATH, the utility name and a set of file extensions from PATHEXT.
Joel Rosdahl <joel@rosdahl.net> [Sat, 28 Apr 2007 16:28:54 +0200] rev 4381
Fix bad reference to RepoError in import command
Bryan O'Sullivan <bos@serpentine.com> [Fri, 27 Apr 2007 21:30:55 -0700] rev 4380
Refactor commands.serve to allow other commands to run as services.
This introduces a new function, cmdutil.service.
Matt Mackall <mpm@selenic.com> [Thu, 26 Apr 2007 18:41:18 -0500] rev 4379
Merge with stable
Brendan Cully <brendan@kublai.com> [Wed, 25 Apr 2007 13:14:01 -0700] rev 4378
Do not automatically rename an atomicfile if a write to it has generated an exception.