diff mercurial/commands.py @ 8746:84c44c9ed555

merge: combine three identical 'remote is newer' cases
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 25e9c71b89de
children bf17aeafb869
line wrap: on
line diff