diff mercurial/simplemerge.py @ 26367:f31ddc9bfa5f stable

unbundle: cleanly abort on unknown bundle2 feature The exception wasn't caught and resulted in a traceback.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 25 Sep 2015 13:30:49 -0700
parents 83df50a8d61c
children 241a1324a180
line wrap: on
line diff