diff options
Diffstat (limited to 'git-merge-fredrik.py')
| -rwxr-xr-x | git-merge-fredrik.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py index 920e10ffbf..9a05ab797c 100755 --- a/git-merge-fredrik.py +++ b/git-merge-fredrik.py @@ -60,7 +60,7 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0): branch1Name, branch2Name, cleanCache, updateWd) - if clean or alwaysWriteTree: + if clean or cleanCache: res = Commit(None, [h1, h2], tree=shaRes) graph.addNode(res) else: |