log tests/test-rebase-newancestor.t @ 29775:978b907d9b36

age author description
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 Dec 2015 12:41:20 -0800 Siddharth Agarwal tests: explicitly request changed version in test-rebase-newancestor.t
Mon, 30 Nov 2015 13:43:55 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to change/delete prompts
Tue, 20 Oct 2015 12:39:49 +0200 Pierre-Yves David test: use generaldelta in 'test-rebase-newancestors.t'
Fri, 09 Jan 2015 10:52:14 -0800 Durham Goode bundles: do not overwrite existing backup bundles (BC)
Fri, 18 Apr 2014 13:33:20 +0200 Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames