diff hgmerge @ 4020:dbf250b80cc2

Add branch name to editor text.
author Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
date Thu, 11 Jan 2007 19:47:51 +0100
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff