Mercurial > hg
log tests/test-rebase-conflicts.t @ 29588:1bb94666b9fc
| age | author | description |
|---|---|---|
| Wed, 10 Feb 2016 09:06:08 -0800 | Ryan McElroy | merge: minimize conflicts when common base is not shown (issue4447) |
| Thu, 24 Dec 2015 20:41:40 +0000 | timeless | rebase: hook afterresolvedstates |
| Tue, 20 Oct 2015 03:14:36 +0200 | Pierre-Yves David | test: use generaldelta in 'test-rebase-conflict.t' |
| 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 |
| Sat, 09 May 2015 23:40:40 -0700 | Pierre-Yves David | progress: get the extremely verbose output out of default debug |