Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge5 @ 1134:2cd33ea2f66b
age | author | description |
---|---|---|
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 19:14:11 -0800 | mpm | [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted |