Mercurial > hg
log tests/test-rebase-conflicts.t @ 26614:ef1eb6df7071
age | author | description |
---|---|---|
Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge |
Wed, 01 Jul 2015 16:33:31 -0500 | Matt Mackall | merge with stable |
Mon, 29 Jun 2015 11:20:09 -0700 | Pierre-Yves David | changegroup: properly compute common base in changeggroupsubset (issue4736) stable |