Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-up-local-change.out @ 2956:6dddcba7596a
age | author | description |
---|---|---|
Fri, 18 Aug 2006 21:17:28 -0700 | Vadim Gelfer | merge. |
Sun, 23 Jul 2006 09:04:14 -0700 | Vadim Gelfer | addremove: do not deprecate. |
Tue, 15 Aug 2006 11:38:07 -0700 | Vadim Gelfer | merge with other head by default, not tip. |
Wed, 09 Aug 2006 13:55:18 -0500 | Matt Mackall | Merge with crew, fix most tests |
Mon, 07 Aug 2006 22:54:33 -0500 | Matt Mackall | Introduce update helper functions: update, merge, clean, and revert |
Mon, 03 Jul 2006 19:28:31 +0200 | Thomas Arendsen Hein | Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec) |