Mercurial > hg > easyhg
diff src/colourset.h @ 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 | b9c153e00e84 |
children | 533519ebc0cb |
author | Chris Cannam |
---|---|
date | Wed, 23 Nov 2011 11:24:23 +0000 |
parents | b9c153e00e84 |
children | 533519ebc0cb |