Mercurial > hg > easyhg
diff deploy/osx/paths.sh @ 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 | 2d3f1e5d8638 |
children | 0f3e086066fc |
author | Chris Cannam |
---|---|
date | Wed, 23 Nov 2011 11:24:23 +0000 |
parents | 2d3f1e5d8638 |
children | 0f3e086066fc |