log tests/test-backout.t @ 28656:b6ed2505d6cf stable

age author description
Sat, 30 Jan 2016 18:00:11 +0900 Yuya Nishihara backout: disable --merge with --no-commit (issue4874) stable
Wed, 20 Jan 2016 08:16:58 -0800 Ruslan Sayfutdinov backout: fix --no-commit option (issue5054) stable
Fri, 15 Jan 2016 13:46:33 -0800 Ruslan Sayfutdinov backout: commit changeset by default (BC)
Thu, 24 Dec 2015 19:25:44 +0000 timeless resolve: suggest the next action
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Fri, 13 Nov 2015 23:01:36 -0800 Siddharth Agarwal debugmergestate: print out record type for files
Sat, 17 Oct 2015 01:15:34 +0900 FUJIWARA Katsunori merge: make in-memory changes visible to external update hooks