diff contrib/win32/hgwebdir_wsgi.py @ 20994:40800668e019

largefiles: don't prompt when one side of merge was changed but didn't change This can happen after backout or grafts or criss cross merges. We already do the same (but slightly different) thing in manifestmerge and filemerge.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 07 Apr 2014 23:10:20 +0200
parents e7cfe3587ea4
children 77142de48ae4
line wrap: on
line diff