Mercurial > repos > other > linux
changeset 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 | 483a45fc520c |
| files | hgrc |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgrc Wed Aug 06 19:22:10 2014 +0000 +++ b/hgrc Wed Aug 06 19:34:53 2014 +0000 @@ -1,7 +1,7 @@ [ui] username = IBBoard <dev@ibboard.co.uk> merge = meld -logtemplate='{rev}:{node|short} ({phase}) {firstline(desc)}\n' +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)