cmcculloh/GitScripts — Issue #4: merge needs to prompt to resolve conflicts
Author: cmcculloh
Created: 2012-01-09 19:45:54+00:00
State: open

merge blah into blah2, if resulting in a conflict, should prompt the user to open mergetool to resolve the conflict.