Mercurial > hg

log tests/test-merge-changedelete.t @ 37489:6e6d68c2d39c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Mon, 08 Jan 2018 19:41:47 +0530 Pulkit Goyal merge: add `--abort` flag which can abort the merge
Tue, 06 Jun 2017 22:17:39 +0530 Pulkit Goyal update: show the commit to which we updated in case of multiple heads (BC)
Sat, 13 May 2017 03:28:36 +0900 FUJIWARA Katsunori filemerge: show warning about choice of :prompt only at an actual fallback
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers
Fri, 07 Oct 2016 08:51:50 -0700 Simon Farnsworth merge: add conflict labels to merge command
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
Sat, 19 Mar 2016 18:37:10 -0700 Simon Farnsworth merge: save merge part labels for later reuse
Tue, 02 Feb 2016 14:49:02 +0000 Pierre-Yves David update: warn about other topological heads on bare update
Fri, 05 Feb 2016 10:22:14 -0800 Durham Goode merge: add file ancestor linknode to mergestate
Wed, 23 Dec 2015 12:51:45 -0800 Siddharth Agarwal filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Sun, 27 Dec 2015 15:24:48 -0800 Danek Duvall tests: Solaris diff -U also emits "No differences encountered"
Tue, 01 Dec 2015 09:48:38 -0800 Siddharth Agarwal filemerge: default regular prompts to 'leave unresolved' (BC)
Mon, 30 Nov 2015 13:43:55 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to change/delete prompts
Mon, 30 Nov 2015 11:17:18 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to regular prompts
Wed, 25 Nov 2015 14:25:33 -0800 Siddharth Agarwal merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Wed, 25 Nov 2015 14:26:46 -0800 Siddharth Agarwal test-merge-changedelete.t: print out debugmergestate
Mon, 23 Nov 2015 13:45:56 -0800 Siddharth Agarwal test-merge-changedelete.t: add resolve --list output
Mon, 23 Nov 2015 13:43:14 -0800 Siddharth Agarwal test-merge-changedelete.t: add a file with regular merge conflicts
Wed, 11 Nov 2015 17:32:41 -0800 Siddharth Agarwal test-merge-prompt.t: rename to test-merge-changedelete.t base tests/test-merge-prompt.t@39d3e036f9be
less more | (0) tip