diff mercurial/merge.py @ 37328:11d51e518808

obsutil: make obsfateprinter() less dependent on templater joinfmt() is defined as 'lambda x: scmutil.formatchangeid(repo[x])' in showsuccsandmarkers(). Function arguments are reordered so they look more normal.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 19 Mar 2018 20:32:06 +0900
parents daef13da66fe
children 7269b87f817c
line wrap: on
line diff