diff contrib/simplemerge @ 32317:6587427b2018

filemerge: store error messages in module variables Copytracing may be disabled because it's too slow (see experimental.disablecopytrace config option). In that case user may get errors like 'local changed FILE which other deleted'. It would be nice to give user a hint to rerun command with `--config experimental.disablecopytrace=False`. To make it possible let's extract error message to variables so that extension may overwrite them.
author Stanislau Hlebik <stash@fb.com>
date Fri, 19 May 2017 03:47:43 -0700
parents 541949a10a68
children aed91971d88c
line wrap: on
line diff