log tests/test-histedit-non-commute.t @ 34716:d36a36ca7bc2

age author description
Thu, 20 Apr 2017 17:18:08 -0700 Siddharth Agarwal histedit: make check for unresolved conflicts explicit (issue5545) stable
Wed, 02 Mar 2016 22:39:03 +0000 timeless histedit: reword message when a changeset produces no changes
Wed, 23 Dec 2015 08:57:04 +0000 timeless histedit: list action when intervention is required
Thu, 24 Dec 2015 20:41:17 +0000 timeless histedit: hook afterresolvedstates
Mon, 14 Dec 2015 22:37:31 +0000 timeless histedit: omit useless message from update (_histedit)
Mon, 14 Dec 2015 21:43:16 +0000 timeless histedit: omit useless message from update (histeditaction)
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge