mercurial-crew-with-dirclash: Changelog

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changelog

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | gz | help
(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 tip

Sun, 29 Apr 2007 12:33:24 -0500 Merge with crew

Matt Mackall <mpm@selenic.com> [Sun, 29 Apr 2007 12:33:24 -0500] rev 4389

Merge with crew

Thu, 26 Apr 2007 18:41:18 -0500 Merge with stable

Matt Mackall <mpm@selenic.com> [Thu, 26 Apr 2007 18:41:18 -0500] rev 4388

Merge with stable

Wed, 25 Apr 2007 13:35:18 -0500 hg serve: don't do DNS lookups

Matt Mackall <mpm@selenic.com> [Wed, 25 Apr 2007 13:35:18 -0500] rev 4387

hg serve: don't do DNS lookups

Sat, 28 Apr 2007 17:55:45 -0300 Fix minor mismerge.

Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 28 Apr 2007 17:55:45 -0300] rev 4386

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

Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 28 Apr 2007 17:55:45 -0300] rev 4385

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

Lee Cantey <lcantey@gmail.com> [Thu, 26 Apr 2007 23:58:18 -0700] rev 4384

Add notes about configuring a merge program

(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 tip

mercurial-crew-with-dirclash