Mercurial > repos > other > linux

comparison hgrc @ 17:483a45fc520c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix multiple heads from forgotten changes on server
author IBBoard <dev@ibboard.co.uk>
date Sun, 10 Aug 2014 19:55:58 +0100
parents c88d17a35d61
children 9c6716c4809b
comparison
equal deleted inserted replaced
11:281a9cb03796 17:483a45fc520c
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} - {age(date)} ({phase}){ifeq(p2rev, '-1', '', '\n Merge: {p1rev}:{p1node|short} && {p2rev}:{p2node|short}')}\n {tabindent(desc)}\n\n'
4 5
5 [trusted] 6 [trusted]
6 #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)
7 #If we don't trust root then we're screwed anyway! 8 #If we don't trust root then we're screwed anyway!
8 users = root 9 users = root