Mercurial > dotfiles

comparison .hgrc @ 261:a5ec16bba8a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: move opendiff support to another file to stop breaking merge on linux
author Augie Fackler <durin42@gmail.com>
date Mon, 16 Aug 2010 12:30:39 -0500
parents 5698bf7ae5b9
children 09c0d4ed07f3
comparison
equal deleted inserted replaced
260:26f9c18b588c 261:a5ec16bba8a9
16 hgext.progress= 16 hgext.progress=
17 hggit= 17 hggit=
18 hgsubversion= 18 hgsubversion=
19 hg_histedit= 19 hg_histedit=
20 hg_remotebranches= 20 hg_remotebranches=
21
22 [merge-tools]
23 filemerge.executable = opendiff-w
24 filemerge.args = $local $other -ancestor $base -merge $output
25 21
26 [alias] 22 [alias]
27 ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")' 23 ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")'
28 upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n' 24 upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n'
29 utip = log -r 'limit(heads(upstream()), 1)' 25 utip = log -r 'limit(heads(upstream()), 1)'