log mercurial/commands.py @ 237:4f802588cdfb

age author description
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:55:56 -0800 mpm make diffdir default to dirstate.parents()