diff mercurial/merge.py @ 19662:7299ef0f0a8b

workingfilectx: remove bogus comment
author Sean Farley <sean.michael.farley@gmail.com>
date Thu, 15 Aug 2013 13:09:34 -0500
parents 499fc471296b
children 76df01e56e7f
line wrap: on
line diff