Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge-revert2.out @ 862:d70c1c31fd45
age | author | description |
---|---|---|
Wed, 10 Aug 2005 06:47:46 +0100 | Thomas Arendsen Hein | Fix 3-way-merge of original parent, workdir and new parent. |
Thu, 04 Aug 2005 13:31:25 -0800 | mpm | Merge with BOS |
Thu, 04 Aug 2005 13:27:41 -0800 | mpm | Merge with TAH |
Thu, 04 Aug 2005 18:13:17 +0100 | Thomas Arendsen Hein | Removed special FIXME handling in run-tests, added bug info to .out files. |
Sat, 30 Jul 2005 08:35:29 -0800 | mpm | Merge with TAH |
Fri, 29 Jul 2005 15:21:02 +0100 | Thomas Arendsen Hein | Updated output of tests. |
Sat, 23 Jul 2005 17:14:05 +0100 | Thomas Arendsen Hein | Added tests for bug with three-way-merging of old tip, tip and cwd. |