Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge1 @ 1612:0d36e3d7e2ea
age | author | description |
---|---|---|
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 |
Sat, 30 Jul 2005 09:00:14 -0800 | mpm | Merge with BOS |
Sat, 30 Jul 2005 08:35:29 -0800 | mpm | Merge with TAH |
Fri, 29 Jul 2005 15:19:43 +0100 | Thomas Arendsen Hein | Don't use 'set -x', fix exports, sed and hexdump usage for Solaris. |
Thu, 21 Jul 2005 15:05:17 -0500 | mpm | Update tests to use commit -m and default -u |
Tue, 21 Jun 2005 21:07:08 -0800 | mpm | Fix up test-merge1 |