Mercurial > hg > hgrc
changeset 38:407028a87e77
wip: show both parents in a merge
oops, in a merge state "." might not show both parents
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Fri, 17 Jun 2016 13:39:06 -0400 |
| parents | cad9bb000413 |
| children | 3dde295ce33e |
| files | hgrc |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgrc +++ b/hgrc @@ -153,4 +153,4 @@ gwip = ' {label("log.branch", ifeq(branch, "default", "", "{branch} "))}{label("changeset.{phase}", gitnode|short)} {label("log.user", author|user)}{label("log.tag", if(tags," {tags}"))} {bookmarks % "{ifeq(bookmark, currentbookmark, label('log.activebookmark', bookmark), label('log.bookmark', bookmark))} "}({label("log.date", date|shortdate)})\n{label(ifcontains(rev, revset('parents()'), 'desc.here'),desc|firstline)}\n' [revsetalias] -wip = (parents(not public()) or not public() or . or head()) and not closed() +wip = (parents(not public()) or not public() or parents() or head()) and not closed()