diff --git a/r2/r2/lib/merge.py b/r2/r2/lib/merge.py index dcf354613..2db111e58 100644 --- a/r2/r2/lib/merge.py +++ b/r2/r2/lib/merge.py @@ -43,10 +43,10 @@ def make_htmldiff(a, b, adesc, bdesc): todesc=bdesc) def threewaymerge(original, a, b): + temp_dir = g.diff3_temp_location if g.diff3_temp_location else None + data = [a, original, b] + files = [] try: - temp_dir = g.diff3_temp_location if g.diff3_temp_location else None - data = [a, original, b] - files = [] for d in data: f = tempfile.NamedTemporaryFile(dir=temp_dir) f.write(d.encode('utf-8'))