diff hgmerge @ 2864:71e78f2ca5ae

merge git patch code.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 12 Aug 2006 12:47:18 -0700
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff