Mercurial Mercurial > mercurial / file revisions
summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) -15 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-changedelete.t
Tue, 18 Jan 2022 15:04:55 -0800 Martin von Zweigbergk merge: set custom conflict label for base commit file | diff | annotate
Thu, 20 Jan 2022 14:13:12 -0800 Martin von Zweigbergk filemerge: always define a "base" label file | diff | annotate
Wed, 10 Mar 2021 13:14:32 +0530 Pulkit Goyal commit: get info from mergestate whether a file was merged or not file | diff | annotate
Wed, 30 Sep 2020 15:09:25 +0530 Pulkit Goyal tests: add newfilenode test case in test-merge-changedelete.t file | diff | annotate
Thu, 03 Sep 2020 13:44:06 +0530 Pulkit Goyal merge: store commitinfo if these is a dc or cd conflict file | diff | annotate
Thu, 13 Feb 2020 21:14:20 -0800 Martin von Zweigbergk debugmergestate: make templated file | diff | annotate
Thu, 20 Jun 2019 11:40:47 -0700 Kyle Lippincott filemerge: make last line of prompts <40 english chars (issue6158) file | diff | annotate
Sun, 26 Aug 2018 19:14:26 +0300 Pulkit Goyal filemerge: fix the wrong placements of messages in prompt file | diff | annotate
Sat, 25 Aug 2018 21:17:34 +0300 Pulkit Goyal filemerge: print the filename in quotes in prompt file | diff | annotate
Mon, 20 Aug 2018 13:29:48 -0400 Augie Fackler merge: improve interactive one-changed one-deleted message (issue5550) file | diff | annotate
Mon, 08 Jan 2018 19:41:47 +0530 Pulkit Goyal merge: add `--abort` flag which can abort the merge file | diff | annotate
Tue, 06 Jun 2017 22:17:39 +0530 Pulkit Goyal update: show the commit to which we updated in case of multiple heads (BC) file | diff | annotate
Sat, 13 May 2017 03:28:36 +0900 FUJIWARA Katsunori filemerge: show warning about choice of :prompt only at an actual fallback file | diff | annotate
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers file | diff | annotate
Fri, 07 Oct 2016 08:51:50 -0700 Simon Farnsworth merge: add conflict labels to merge command file | diff | annotate
less more (0) -15 tip
mercurial