diff options
| author | Han-Wen Nienhuys <hanwen@google.com> | 2022-08-25 19:37:35 +0200 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@google.com> | 2022-09-06 10:01:44 +0200 |
| commit | 2778bb2cc9bf7bdfb2ed7b3a99dd931d6d3fbbfa (patch) | |
| tree | 7bd70993307b3d1367aa30a736cb530704351ec6 /org.eclipse.jgit/src/org/eclipse/jgit/merge | |
| parent | 25aceffdc58fdc5707c908fb4c3584116703046e (diff) | |
| download | jgit-2778bb2cc9bf7bdfb2ed7b3a99dd931d6d3fbbfa.tar.gz jgit-2778bb2cc9bf7bdfb2ed7b3a99dd931d6d3fbbfa.zip | |
WorkTreeUpdater: remove safeWrite option
This was added in Ideaefd5178 to anticipate on writing files for
ApplyCommand, but we are keeping WorkTreeUpdater private to the merge
package for now.
Change-Id: Ifa79dac245e60eb7a77eaea4cc1249222e347d38
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index d79f5d4100..f4d19cb79a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -915,7 +915,7 @@ public class ResolveMerger extends ThreeWayMerger { StreamLoader contentLoader = WorkTreeUpdater.createStreamLoader(rawMerged::openInputStream, rawMerged.length()); workTreeUpdater.updateFileWithContent(contentLoader, - eol, tw.getSmudgeCommand(attributes), of.getPath(), of, false); + eol, tw.getSmudgeCommand(attributes), of.getPath(), of); return of; } |