log mercurial/hg.py @ 276:10e325db7347

age author description
Wed, 08 Jun 2005 10:16:33 -0800 mpm add tracking of execute permissions
Tue, 07 Jun 2005 20:06:05 -0800 mpm various merge improvements
Tue, 07 Jun 2005 19:00:56 -0800 mpm merge: Fix bug where we overwrote local when local was newer