Sun, 08 Nov 2015 17:56:48 -0500 Matt Harbison rebase: preserve the 'intermediate-source' attribute of grafts
Wed, 11 Nov 2015 15:08:08 -0600 Matt Mackall merge with stable
Wed, 04 Nov 2015 12:14:18 -0500 Augie Fackler verify: add a hook that can let extensions manipulate file lists
Tue, 10 Nov 2015 17:16:59 -0800 Siddharth Agarwal resolve: don't abort when file is missing
Tue, 10 Nov 2015 17:13:16 -0800 Siddharth Agarwal filemerge: treat EOF at prompt as fail, not abort
Tue, 10 Nov 2015 17:10:47 -0800 Siddharth Agarwal test-merge-tools.t: add 'hg resolve --list' output to tests
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 tip