Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4692:c135c6cddbec
Command in doc comment is now on a single line, fixed
after previous formatting broke it.
author | paul sorenson <sf@metrak.com> |
---|---|
date | Sat, 23 Jun 2007 22:25:11 -0500 |
parents | dc5920ea12f8 |
children | 8808ea7da86b |