diff tests/test-merge-changedelete.t @ 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 1b5c61d38a52
children 41ef02ba329b
line wrap: on
line diff