diff mercurial/simplemerge.py @ 24775:36993b52d016

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Apr 2015 17:30:01 -0500
parents 83df50a8d61c
children 241a1324a180
line wrap: on
line diff