comparison tests/test-obsolete-divergent.t @ 31204:84e8a6834223

filemerge: tag merge tool for blocked times Merge tools can take a while - let's ensure that they're appropriately tagged
author Simon Farnsworth <simonfar@fb.com>
date Mon, 06 Mar 2017 03:19:40 -0800
parents fab9dda0f2a3
children 68f3e819d41d
comparison
equal deleted inserted replaced
31203:a8e4322f64c1 31204:84e8a6834223