[llvm] efd84a5 - Remove Combine.td.rej file

[Konstantin Zhuravlyov via llvm-commits]

Author: Konstantin Zhuravlyov
Date: 2020-10-14T11:39:28-04:00
New Revision: efd84a5f5db2dfd8b4dcf3ac8b56a00edd61a693

URL: https://github.com/llvm/llvm-project/commit/efd84a5f5db2dfd8b4dcf3ac8b56a00edd61a693
DIFF: https://github.com/llvm/llvm-project/commit/efd84a5f5db2dfd8b4dcf3ac8b56a00edd61a693.diff

LOG: Remove Combine.td.rej file

Added: 
    

Modified: 
    

Removed: 
    llvm/include/llvm/Target/GlobalISel/Combine.td.rej


################################################################################
diff  --git a/llvm/include/llvm/Target/GlobalISel/Combine.td.rej b/llvm/include/llvm/Target/GlobalISel/Combine.td.rej
deleted file mode 100644
index 26e596756cd8..000000000000
--- a/llvm/include/llvm/Target/GlobalISel/Combine.td.rej
+++ /dev/null
@@ -1,11 +0,0 @@
-***************
-*** 532,535 ****
-      not_cmp_fold, opt_brcond_by_inverting_cond,
-      unmerge_merge, fabs_fabs_fold, unmerge_cst, unmerge_dead_to_trunc,
-      unmerge_zext_to_zext, trunc_ext_fold, trunc_shl,
--     constant_fp_op, xor_of_and_with_same_reg]>;
---- 542,545 ----
-      not_cmp_fold, opt_brcond_by_inverting_cond,
-      unmerge_merge, fabs_fabs_fold, unmerge_cst, unmerge_dead_to_trunc,
-      unmerge_zext_to_zext, trunc_ext_fold, trunc_shl,
-+     xor_of_and_with_same_reg, const_combines]>;