diff hgweb.cgi @ 27021:f2554154509f

unshelve: add support for custom merge tools For parity with merge --tool, rebase --tool etc. rebase.rebase overwrites the tool in repo.ui, so we need to explicitly pass it down there too.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 15:11:23 -0800
parents 4b0fc75f9403
children 47ef023d0165
line wrap: on
line diff