log tests/test-copy-move-merge.t @ 43853:4f40dc190f63 stable

age author description
Thu, 20 Jun 2019 11:40:47 -0700 Kyle Lippincott filemerge: make last line of prompts <40 english chars (issue6158)
Thu, 11 Apr 2019 23:28:38 -0700 Martin von Zweigbergk copies: delete debug message about search limit
Sun, 26 Aug 2018 19:14:26 +0300 Pulkit Goyal filemerge: fix the wrong placements of messages in prompt
Sat, 25 Aug 2018 21:17:34 +0300 Pulkit Goyal filemerge: print the filename in quotes in prompt
Mon, 20 Aug 2018 13:29:48 -0400 Augie Fackler merge: improve interactive one-changed one-deleted message (issue5550)
Sun, 10 Dec 2017 22:50:57 -0500 Matt Harbison tests: remove (glob) annotations that were only for '\' matches
Sun, 03 Sep 2017 02:34:01 +0530 Pulkit Goyal copytrace: move the default copytracing algorithm in a new function
Sun, 03 Sep 2017 01:52:19 +0530 Pulkit Goyal copytrace: replace experimental.disablecopytrace config with copytrace (BC)
Fri, 07 Jul 2017 18:51:46 -0700 Jun Wu rebase: use scmutil.cleanupnodes (issue5606) (BC)
Fri, 12 Aug 2016 05:56:40 -0700 Simon Farnsworth merge: always use other, not remote, in user prompts
Fri, 12 Aug 2016 06:01:42 -0700 Simon Farnsworth merge: use labels in prompts to the user
Wed, 23 Mar 2016 13:34:47 -0700 Martijn Pieters graphmod: set default edge styles for ascii graphs (BC)
Mon, 29 Feb 2016 01:01:20 -0500 Matt Harbison tests: flag Windows specific lines about background closing as optional
Wed, 23 Dec 2015 12:41:20 -0800 Siddharth Agarwal test-copy-move-merge.t: explicitly request changed version
Mon, 30 Nov 2015 13:43:55 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to change/delete prompts