54262d42ff7c

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Mon, 03 Oct 2016 11:45:40 +0000
parents 30832b77a931 (current diff) ca659a3b3b97 (diff)
children 8dd04e954ca9
branches/tags (none)
files prompt.py

Changes

diff -r 30832b77a931 -r 54262d42ff7c prompt.py
--- a/prompt.py	Wed Jul 27 20:40:17 2016 -0400
+++ b/prompt.py	Mon Oct 03 11:45:40 2016 +0000
@@ -384,7 +384,7 @@
                 tip = head
                 break
 
-        return _with_groups(m.groups(), '^') if current_rev != repo[tip] else ''
+        return _with_groups(m.groups(), '^') if current_rev.children() else ''
 
 
     if opts.get("angle_brackets"):