Mercurial > hg > easyhg
diff easyhg.qrc @ 530:2262f753b19e
Add more useful message for merge with working directory ancestor
author | Chris Cannam |
---|---|
date | Wed, 23 Nov 2011 11:24:23 +0000 |
parents | 6bb2a1f3087c |
children | f56e5c39aad1 |
author | Chris Cannam |
---|---|
date | Wed, 23 Nov 2011 11:24:23 +0000 |
parents | 6bb2a1f3087c |
children | f56e5c39aad1 |