Mercurial > hg
log tests/test-merge-types.t @ 17700:5b1b0e4e6902
| age | author | description |
|---|---|---|
| Thu, 05 Jul 2012 00:35:42 +0200 | Mads Kiilerich | tests: fix test markup in test-merge-types.t |
| Wed, 04 Apr 2012 11:18:42 +0200 | Thomas Arendsen Hein | test-merge-types: allow different output with existing hgmerge (issue3346) stable |
| Tue, 13 Mar 2012 16:28:08 -0500 | Matt Mackall | merge: handle linear update to symlink correctly (issue3316) stable |
| Fri, 09 Dec 2011 17:34:53 +0100 | Martin Geisler | merge: make debug output easier to read |
| Mon, 07 Nov 2011 03:14:54 +0100 | Mads Kiilerich | tests: use 'hghave execbit' for tests that manipulate x bit in file system |
| Mon, 07 Nov 2011 03:14:54 +0100 | Mads Kiilerich | tests: use 'hghave symlink' for tests using symlinks |
| Tue, 14 Sep 2010 12:20:51 +0200 | Adrian Buehlmann | combine tests base tests/test-merge-types@79b11a6f7640 |