f0770fa84d
Among other things, when choosing the local side for a conflict, the remote version could still end up being saved. |
||
---|---|---|
.. | ||
components | ||
content | ||
resource | ||
tests | ||
chrome.manifest | ||
install.rdf | ||
runtests.sh |
f0770fa84d
Among other things, when choosing the local side for a conflict, the remote version could still end up being saved. |
||
---|---|---|
.. | ||
components | ||
content | ||
resource | ||
tests | ||
chrome.manifest | ||
install.rdf | ||
runtests.sh |