changeset 28403 | d2e154dddb6e |
parent 28384 | 3356bf61fa25 |
child 28462 | dbba18ba26d4 |
--- a/mercurial/templater.py Thu Dec 24 04:31:34 2015 +0000 +++ b/mercurial/templater.py Wed Mar 02 05:27:07 2016 +0000 @@ -891,6 +891,8 @@ stylelist = [] for file in dirlist: split = file.split(".") + if split[-1] in ('orig', 'rej'): + continue if split[0] == "map-cmdline": stylelist.append(split[1]) return ", ".join(sorted(stylelist))