Mercurial > hg > gitweb
diff setup.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 | 4a6ab4d80dc4 |
children | 67b8d24d2dbe 083c38bdfa64 |
author | mpm@selenic.com |
---|---|
date | Tue, 17 May 2005 01:07:57 -0800 |
parents | 4a6ab4d80dc4 |
children | 67b8d24d2dbe 083c38bdfa64 |