Adding a line for rebasing example, then more changes from myfeature branch too Updating for emergency fix after stash.
This example is to show the use of the p4merge tool
As stated above, this is to use the diff and merge visual tools of p4merge
No deployment, it's just an example!
2020 git.training. All rights resereved.