Mercurial > hg
log tests/test-contrib.t @ 30993:9c2977ceaa46
| age | author | description |
|---|---|---|
| Wed, 10 Feb 2016 09:06:08 -0800 | Ryan McElroy | merge: minimize conflicts when common base is not shown (issue4447) |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge |
| Wed, 15 Oct 2014 15:35:59 -0400 | Augie Fackler | tests: use $PYTHON instead of hardcoding python |
| Tue, 05 Aug 2014 15:10:50 -0700 | Pierre-Yves David | simplemerge: support three labels when merging |
| Tue, 05 Aug 2014 14:56:25 -0700 | Pierre-Yves David | simplemerge: burn "minimal" feature to the ground |
| Fri, 10 May 2013 22:47:12 +0200 | Benoit Boissinot | shrink: delete extension preventing further refactoring (BC) |
| Fri, 15 Jun 2012 00:02:27 +0200 | Mads Kiilerich | tests: introduce hghave hardlinks |