comparison hgweb.cgi @ 21525:559f01f19cf6

graft: customize graft conflict markers (BC) Changes the graft conflict markers to be 'graft' and 'local' to make it more intuitive which side is which.
author Durham Goode <durham@fb.com>
date Fri, 09 May 2014 18:15:02 -0700
parents 85cba926cb59
children 4b0fc75f9403
comparison
equal deleted inserted replaced
21524:47b97d9af27e 21525:559f01f19cf6