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 |
Fri, 12 Aug 2016 05:56:40 -0700 | Simon Farnsworth | merge: always use other, not remote, in user prompts | file | diff | annotate |
Fri, 12 Aug 2016 06:01:42 -0700 | Simon Farnsworth | merge: use labels in prompts to the user | file | diff | annotate |