comparison tests/pdiff @ 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 869e65e68aee
children a2b55ee62803
comparison
equal deleted inserted replaced
33311:f8f716da90fa 33312:b5612dbe72a3