diff mercurial/httppeer.py @ 31160:487ec7b096e2

merge: make "linear" an input in docstring table Instead of having two ouputs, it seem simpler to have an addition input. This will allow further simplification.
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 27 Feb 2017 14:58:53 -0800
parents 48dea083f66d
children bf855efe5664
line wrap: on
line diff