comparison hgext/win32text.py @ 31158:58f55f0b40dc

merge: drop obsolete non-linear cases from docstring table Since 6b1fc09c699a (update: change default destination to tipmost descendant (issue4673) (BC), 2016-02-02), non-linear updates can no longer happen if the user doesn't specify a destination, so we can drop these case from the table in the docstring of merge.update().
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 27 Feb 2017 14:27:22 -0800
parents d5883fd055c6
children ec7831675867
comparison
equal deleted inserted replaced
31157:accdd5e62066 31158:58f55f0b40dc