Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge1.out @ 3156:b1f10d3223c1
age | author | description |
---|---|---|
Tue, 22 Aug 2006 17:08:38 -0500 | Matt Mackall | merge: simplify working dir manifest generation |
Tue, 02 May 2006 18:44:02 +0200 | Thomas Arendsen Hein | Make hg update more verbose by default (issue12) |
Fri, 24 Mar 2006 14:53:23 +0100 | mcmillen | Spelling fix: "commited" -> "committed" |
Wed, 14 Dec 2005 22:19:03 -0600 | Benoit Boissinot | abort when merging two heads and repository has local changes |
Tue, 13 Sep 2005 18:38:27 -0500 | mpm | Fix bug with co -C across branches, update tests |
Tue, 16 Aug 2005 19:03:01 -0800 | mpm | run-tests: remove '+ hg' trick |
Sat, 30 Jul 2005 09:00:14 -0800 | mpm | Merge with BOS |