annotate easyhg.icns @ 328:ea62eb083ed4 filelist_right_button_menu

Merge fixes: primarily, handle failed merges better
author Chris Cannam
date Fri, 11 Mar 2011 18:08:22 +0000
parents 43ecb0dcc44e
children
rev   line source
Chris@215 1 (binary:application/octet-stream)