fix: add GIT_EDITOR env var to merge-resolver mode for non-interactive rebase#7819

mrubens merged 1 commit intomainRooCodeInc/Roo-Code:mainfrom

update-merge-resolver-rulesRooCodeInc/Roo-Code:update-merge-resolver-rulesCopy head branch name to clipboard