diff .hgtags @ 27458:d39e743e3578

rebase: mention conflict in documentation instead of merge
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 18:32:15 +0000
parents 33cb39084a1e
children 7d8edb6992dc
line wrap: on
line diff