comparison hgrc @ 16:c88d17a35d61

Actually, merge details and dates are useful in Mercurial logs - more reformatting!
author IBBoard <dev@ibboard.co.uk>
date Wed, 06 Aug 2014 19:34:53 +0000
parents 710955cdb377
children 9c6716c4809b
comparison
equal deleted inserted replaced
15:710955cdb377 16:c88d17a35d61
1 [ui] 1 [ui]
2 username = IBBoard <dev@ibboard.co.uk> 2 username = IBBoard <dev@ibboard.co.uk>
3 merge = meld 3 merge = meld
4 logtemplate='{rev}:{node|short} ({phase}) {firstline(desc)}\n' 4 logtemplate='{rev}:{node|short} - {age(date)} ({phase}){ifeq(p2rev, '-1', '', '\n Merge: {p1rev}:{p1node|short} && {p2rev}:{p2node|short}')}\n {tabindent(desc)}\n\n'
5 5
6 [trusted] 6 [trusted]
7 #Trust root (mainly for VPS running, where some repos are owned by root and we want to do "hg status" without sudo-ing) 7 #Trust root (mainly for VPS running, where some repos are owned by root and we want to do "hg status" without sudo-ing)
8 #If we don't trust root then we're screwed anyway! 8 #If we don't trust root then we're screwed anyway!
9 users = root 9 users = root