Mercurial Mercurial > hg / changelog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | zip | gz | bz2 | help
(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sat, 28 Apr 2007 17:55:45 -0300 Fix minor mismerge.
changeset
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 28 Apr 2007 17:55:45 -0300] rev 4388
Fix minor mismerge. The caching of umask ended up being duplicated.
Sat, 28 Apr 2007 17:55:45 -0300 run-tests.py: pass -L/--label to simplemerge
changeset
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.
Thu, 26 Apr 2007 23:58:18 -0700 Add notes about configuring a merge program
changeset
Lee Cantey <lcantey@gmail.com> [Thu, 26 Apr 2007 23:58:18 -0700] rev 4386
Add notes about configuring a merge program
Fri, 27 Apr 2007 16:04:17 -0700 Update copyright year and change to range
changeset
Lee Cantey <lcantey@gmail.com> [Fri, 27 Apr 2007 16:04:17 -0700] rev 4385
Update copyright year and change to range
Sat, 28 Apr 2007 11:53:36 +0200 Use patch.patch() when checking for patch availability.
changeset
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.
Sat, 28 Apr 2007 09:03:47 -0700 Merge with crew
changeset
Brendan Cully <brendan@kublai.com> [Sat, 28 Apr 2007 09:03:47 -0700] rev 4383
Merge with crew
(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip
Mercurial