diff mercurial/simplemerge.py @ 19374:0101aaf6ff52 stable

Added tag 2.6.3 for changeset 009794acc6e3
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Jul 2013 18:07:29 -0500
parents e34106fa0dc3
children 4aeb7a6029ba
line wrap: on
line diff