diff options
| author | Shawn Pearce <sop@google.com> | 2014-11-25 16:14:33 -0800 |
|---|---|---|
| committer | Shawn Pearce <spearce@spearce.org> | 2014-11-27 13:41:58 -0800 |
| commit | 3886a4f68b2a85526196c09332843676de9461cd (patch) | |
| tree | 73bbaa969dae6680baaf2f9714e56c03c5d14f20 /org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 8).launch | |
| parent | a606dc363d0f6b09e4527cca6b645d3cb1ec407d (diff) | |
| download | jgit-3886a4f68b2a85526196c09332843676de9461cd.tar.gz jgit-3886a4f68b2a85526196c09332843676de9461cd.zip | |
ResolveMerger: Use checkoutEntry during abort
The cleanUp path is trying to restore files that previously were
clean, but were overwritten in the work tree by a partial merge
attempt that has failed and needs to be aborted. Reuse the checkout
logic to write the file content and refresh the stat data.
Change-Id: I320d33b3744daf88d3155db99e957408937ddd00
Diffstat (limited to 'org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 8).launch')
0 files changed, 0 insertions, 0 deletions