Mercurial > hg
log tests/test-merge-commit @ 8480:0e91bcaaa92c
age | author | description |
---|---|---|
Sun, 26 Apr 2009 14:29:02 +0200 | Martin Geisler | tests: removed redundant "-d '0 0'" from test scripts |
Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | change tests to use simplemerge by default |
Tue, 30 Jan 2007 19:09:08 -0200 | Alexis S. L. Carvalho | filecommit: don't forget the local parent on a merge with a local rename |