Mercurial > hg > mercurial-crew-with-dirclash
diff README @ 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 | a182f2561c8e |
children | 17884f79d59d |
author | mpm@selenic.com |
---|---|
date | Tue, 17 May 2005 01:07:57 -0800 |
parents | a182f2561c8e |
children | 17884f79d59d |