log

age author description
Wed, 13 Jan 2016 15:47:37 -0600 Matt Mackall merge with stable
Tue, 12 Jan 2016 13:10:31 -0800 Martin von Zweigbergk context: check for differing flags a little earlier