diff contrib/editmerge @ 23665:a90499a6ad8d

trydiff: use 'ctx1.flags()' for symmetry with 'ctx2.flags()'
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 23 Dec 2014 16:16:26 -0800
parents 864c56cb8945
children 4b0fc75f9403
line wrap: on
line diff