4b7cdddb4a
Say "Use the [local|remote] version for all remaining conflicts" for
everything instead of saying "Use [local|remote] fields for all
remaining conflicts" for some conflicts.
This also fixes a test failure after
|
||
---|---|---|
.. | ||
components | ||
content | ||
resource | ||
tests | ||
chrome.manifest | ||
install.rdf | ||
runtests.sh |