From 962dc63442f1550ec0a86ed532bfe8ed116a848f Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Sun, 2 Sep 2012 01:14:34 -0500
Subject: [PATCH] Changing from DIFFPRE -> FULLMERGE.

---
 apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java b/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
index ab361677..b8870ae0 100644
--- a/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
+++ b/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java
@@ -44,7 +44,7 @@ public class SmaliDecoder {
             baksmali.disassembleDexFile(mApkFile.getAbsolutePath(),
                 new DexFile(mApkFile), false, mOutDir.getAbsolutePath(), null,
                 null, null, false, true, true, true, false, false, 
-                mDebug ? main.DIFFPRE : 0, false, mDebug ? true : false, null);
+                mDebug ? main.FULLMERGE : 0, false, mDebug ? true : false, null);
         } catch (IOException ex) {
             throw new AndrolibException(ex);
         }