Resolve Using Mine" and "Resolve Using Theirs" does not work as expected.

When performing a rebase on a Git Repository, a conflict is identified. The user can use the "Resolve Using Mine" or "Resolve Using Theirs" to quickly resolve the conflict. However, using either of these functions will remove all changes.

Steps to Reproduce:
1. Create a new Git Repository
2. Add and commit a new file TEMP.TXT with the text "Hello World"
3. Create a new branch called BranchGoodbye
3a. On BranchGoodbye, edit TEMP.TXT to be "Goodbye World"
4. Checkout master, and create a new branch called BranchAdam
4a. On BranchAdam, edit TEMP.TXT to be "Hello Adam"
5. On BranchAdam, rebase with BranchGoodbye

At Step 5, there will now be a conflict on TEMP.TXT

Notice that using "Resolve Using Mine" and "Resolve Using Theirs" will not work as expected.