Mercurial > dotfiles

comparison .hgrc @ 338:3f3d52956ff7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: use detailed merge markers by default
author Augie Fackler <raf@durin42.com>
date Fri, 18 Jul 2014 20:15:41 -0400
parents 7a736d851718
children 1b4b235482c5
comparison
equal deleted inserted replaced
337:5ce7678830fa 338:3f3d52956ff7
29 29
30 [ui] 30 [ui]
31 username = Augie Fackler <raf@durin42.com> 31 username = Augie Fackler <raf@durin42.com>
32 ignore = ~/.hgglobalignore 32 ignore = ~/.hgglobalignore
33 usehttp2=true 33 usehttp2=true
34 mergemarkers = detailed
34 35
35 [defaults] 36 [defaults]
36 qimport = --git 37 qimport = --git
37 qrefresh = --git 38 qrefresh = --git
38 annotate = -nu 39 annotate = -nu