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()
|
Fri, 03 Jun 2005 12:54:14 -0800 |
mpm |
teach rawcommit about dirstate.parents()
|
Fri, 03 Jun 2005 12:46:38 -0800 |
mpm |
move repo.current to dirstate.parents()
|
Fri, 03 Jun 2005 12:45:04 -0800 |
mpm |
merge: don't bail on outstanding changes
|
Fri, 03 Jun 2005 12:44:01 -0800 |
mpm |
fix repo locking
|