diff mercurial/server.py @ 33312:b5612dbe72a3

summary: don't reimplment mergestate.unresolved()
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2015 09:37:12 -0800
parents e48cb1c7a902
children bfcd0d227972
line wrap: on
line diff