refactor this out to ensure we clean up the diff when we're not necessarily near the context
refactor this out to ensure we clean up the diff when we're not necessarily near the context

shiftkey/desktop,BugTesterTest/desktops,hjobrien/desktop,desktop/desktop,j-f1/forked-desktop,BugTesterTest/desktops,kactus-io/kactus,shiftkey/desktop,gengjiawen/desktop,hjobrien/desktop,say25/desktop,BugTesterTest/desktops,gengjiawen/desktop,desktop/desktop,desktop/desktop,desktop/desktop,artivilla/desktop,hjobrien/desktop,gengjiawen/desktop,artivilla/desktop,j-f1/forked-desktop,artivilla/desktop,j-f1/forked-desktop,say25/desktop,hjobrien/desktop,artivilla/desktop,say25/desktop,shiftkey/desktop,say25/desktop,kactus-io/kactus,kactus-io/kactus,BugTesterTest/desktops,shiftkey/desktop,j-f1/forked-desktop,kactus-io/kactus,gengjiawen/desktop