Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3263:fc34c031ff54
Rename default style to old
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 04 Oct 2006 17:04:40 -0700 |
parents | 7a0d70b69d74 |
children | 751840e739a1 |