git-mediate adds files when resolved, which makes sense when the conflicts arise from mergeing, cherry-picking or reverting, but when they arise from stash pop, the popped changes would normally not be git added. Would be nice if git-mediate would clear the conflict without adding when it's a stash pop.
git-mediateadds files when resolved, which makes sense when the conflicts arise frommergeing,cherry-picking orreverting, but when they arise fromstash pop, the popped changes would normally not begit added. Would be nice ifgit-mediatewould clear the conflict without adding when it's a stash pop.