Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/dirstate.py @ 3068:547d1a4aa105
hg merge: fix lookup of branch
add some tests for branch usage
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 08 Sep 2006 02:16:16 +0200 |
parents | 882e703eaa94 |
children | b1f10d3223c1 |