Mercurial > hg

log contrib/editmerge @ 44235:6b7aef44274b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Mon, 19 Oct 2015 21:36:12 -0700 Ryan McElroy editmerge: dequote other use of $ED
Sat, 17 Oct 2015 15:48:14 -0700 Ryan McElroy editmerge: properly quote variables
Fri, 16 Oct 2015 15:01:42 -0700 Christian Delahousse contrib: make editmerge look for merge markers at the beginning of the line
Wed, 30 Sep 2015 15:43:49 -0500 Matt Mackall urls: bulk-change primary website URLs
Wed, 26 Mar 2014 11:59:13 +0100 Olle Lundberg contrib: don't hardcode path to bash interpreter
Fri, 15 Nov 2013 13:20:49 -0800 Durham Goode contrib: add editmerge script for editor conflict prompts
less more | (0) tip