Change to show hwo git stash works
Mergeconf