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' |