Description of 'git stash apply/pop' should say a merge happens

[fpl9000]

The description of git stash apply and git stash pop should mention that the stashed changes are merged into the working tree and can result in merge conflicts. It should advise the user how to avoid merge conflicts (by bringing the working tree back to a state where the stash entry applies without conflicts).