Mercurial > repos > other > linux
diff hgrc @ 17:483a45fc520c
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 |
line wrap: on
line diff
--- a/hgrc Sun Aug 10 19:54:53 2014 +0100 +++ b/hgrc Sun Aug 10 19:55:58 2014 +0100 @@ -1,6 +1,7 @@ [ui] username = IBBoard <dev@ibboard.co.uk> merge = meld +logtemplate='{rev}:{node|short} - {age(date)} ({phase}){ifeq(p2rev, '-1', '', '\n Merge: {p1rev}:{p1node|short} && {p2rev}:{p2node|short}')}\n {tabindent(desc)}\n\n' [trusted] #Trust root (mainly for VPS running, where some repos are owned by root and we want to do "hg status" without sudo-ing)