# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1479642760 0
# Node ID a6371635b645ab425b7f36a42ff34d9805df52f9
# Parent  168328ff4a519c9ab2a04e3679d4332c0d8562e6# Parent  66e2a34005b447d321a96838d7fe2b161e78b7a9
Merge.

diff -r 66e2a34005b4 -r a6371635b645 map-cmdline.nlog
--- a/map-cmdline.nlog	Fri May 18 17:05:39 2012 +0200
+++ b/map-cmdline.nlog	Sun Nov 20 11:52:40 2016 +0000
@@ -1,6 +1,8 @@
-changeset = 'changeset: \033[0;31m[{phase}]\033[0m \033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m{branches}{bookmarks}{tags}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\nsummary:   {desc|firstline|strip}\n\n{file_mods}{file_adds}{file_dels}\n\n'
+changeset         = 'changeset: {cset_info}\nparent(s): {parent_info}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\nsummary:   {desc|firstline|strip}\n\n{file_mods}{file_adds}{file_dels}\n\n'
+changeset_verbose = 'changeset: {cset_info}\nparent(s): {parent_info}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\n\n{desc}\n\n{file_mods}{file_adds}{file_dels}\n\n'
 
-changeset_verbose = 'changeset: \033[0;31m[{phase}]\033[0m \033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m{branches}{bookmarks}{tags}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\n\n{desc}\n\n{file_mods}{file_adds}{file_dels}\n\n'
+cset_info = '\033[0;31m[{phase}]\033[0m \033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m{branches}{bookmarks}{tags}'
+parent_info = '\033[0;33m{ifeq(p1rev, -1, '', '{p1rev}:{p1node|short}')}{ifeq(p2rev, -1, '', ' {p2rev}:{p2node|short}')}\033[0m'
 
 start_file_adds = ''
 file_add = '\033[0;32mA {file_add}\033[0m\n'