diff hgaction.h @ 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 5b4aa1c24407
children 4cd753e083cc
line wrap: on
line diff