diff mercurial/ancestor.py @ 18360:760c0d67ce5e

merge: process files in sorted order
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 02:59:12 +0100
parents f7f8159caad3
children 2f7186400a07
line wrap: on
line diff