comparison filestates.cpp @ 153:70fe12873106

* Show both parents of uncommitted merge; fixes to right-button menus
author Chris Cannam
date Thu, 02 Dec 2010 17:55:21 +0000
parents 1721c580c10e
children 087d7cdde662
comparison
equal deleted inserted replaced
152:2b997861174b 153:70fe12873106