Mercurial > hg > mercurial-crew-with-dirclash
diff hgweb.py @ 78:85f1f87dc8ff
Add "HG: merge resolve" to editor text for merge
author | mpm@selenic.com |
---|---|
date | Tue, 17 May 2005 01:07:57 -0800 |
parents | 1215bf60468f |
children | db5eb6a86179 58039eddbdda |