diff mercurial/error.py @ 26534:e4f27fb65da7

merge: drop special parent assignment in the obsolete case We can safely drop this because the very same assignment is enforcement later in the function. Dropping it will make it simpler to extract the default destination logic in its own function.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 05 Oct 2015 01:47:33 -0700
parents 024644b1900b
children b13fdcc4e700
line wrap: on
line diff