diff mercurial/match.py @ 21268:a0b8a912ec81

merge: simplify mergestate iter
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 13 May 2012 17:45:08 +0200
parents a2f4ea82d6d3
children a4b67bf1f0a5
line wrap: on
line diff