Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/hg.py @ 240:737c66b68290
age | author | description |
---|---|---|
Fri, 03 Jun 2005 18:27:55 -0800 | mpm | Replace tkmerge with hgmerge |
Fri, 03 Jun 2005 13:32:37 -0800 | mpm | Merge from tah |
Fri, 03 Jun 2005 12:58:47 -0800 | mpm | hg resolve: merge a given node into the working directory |
Fri, 03 Jun 2005 12:56:50 -0800 | mpm | add 'm' state to dirstates |
Fri, 03 Jun 2005 12:55:56 -0800 | mpm | make diffdir default to dirstate.parents() |
Fri, 03 Jun 2005 12:54:54 -0800 | mpm | teach commit about dirstate.parents() |