start of ability to edit effective/merged scripts list in UI
Merge branch 'SpencerP_master' of https://github.com/jbialobr/gitextensions
fix compile error -- my bad, sorry
caller must supply this arg now
consolidate diffing logic
Merge branch 'SpencerP_master' of https://github.com/jbialobr/gitextensions

Conflicts:
	GitUI/Script/ScriptManager.cs