# Conflicts:
#	src/main/java/cn/edu/nju/software/ir/opt/TestOpt.java
#	src/test/resources/2023/95_float.ll
#	src/test/resources/2023performance/00_bitset1.sy
#	src/test/resources/c/test1.c
#	target/classes/cn/edu/nju/software/ir/basicblock/BasicBlockRef$1.class
#	target/classes/cn/edu/nju/software/ir/basicblock/BasicBlockRef$2.class
#	target/classes/cn/edu/nju/software/ir/basicblock/BasicBlockRef.class
#	target/classes/cn/edu/nju/software/ir/instruction/OpEnum.class
#	target/classes/cn/edu/nju/software/ir/instruction/Operator.class
#	target/classes/cn/edu/nju/software/ir/opt/TestOpt.class
#	target/classes/cn/edu/nju/software/ir/value/FunctionValue$1.class
#	target/classes/cn/edu/nju/software/ir/value/FunctionValue$2.class
#	target/classes/cn/edu/nju/software/ir/value/FunctionValue.class
#	target/test-classes/c/test1.c
#	target/test-classes/linked.ll

# Conflicts:
#	.gitignore
#	src/main/java/cn/edu/nju/software/backend/RiscInstrGenerator.java
#	src/main/java/cn/edu/nju/software/ir/basicblock/BasicBlockRef.java
#	src/main/java/cn/edu/nju/software/ir/instruction/Operator.java
#	src/main/java/cn/edu/nju/software/ir/instruction/logic/Lshr.java
#	src/main/java/cn/edu/nju/software/pass/FunctionInlinePass.java

# Conflicts:
#	src/test/java/cn/edu/nju/software/FrontEndTest.java
#	src/test/java/cn/edu/nju/software/util/CmdExecutor.java
#	src/test/resources/2023/82_long_func.ll
#	src/test/resources/2023/95_float.ll
#	target/test-classes/cn/edu/nju/software/FrontEndTest.class
#	target/test-classes/cn/edu/nju/software/util/CmdExecutor.class
#	target/test-classes/linked.ll

# Conflicts:
#	src/test/java/cn/edu/nju/software/FrontEndTest.java
#	src/test/resources/2023/82_long_func.ll
#	src/test/resources/2023/95_float.ll
#	target/classes/cn/edu/nju/software/ir/basicblock/BasicBlockRef.class
#	target/classes/cn/edu/nju/software/ir/generator/IRVisitor.class
#	target/classes/cn/edu/nju/software/ir/instruction/Instruction.class
#	target/classes/cn/edu/nju/software/ir/value/LocalVar.class
#	target/classes/cn/edu/nju/software/ir/value/ValueRef.class
#	target/classes/cn/edu/nju/software/pass/EliminateConstExp.class
#	target/classes/cn/edu/nju/software/pass/FunctionInlinePass.class
#	target/classes/cn/edu/nju/software/pass/MemToReg.class
#	target/classes/cn/edu/nju/software/pass/PassManager.class
#	target/test-classes/cn/edu/nju/software/FrontEndTest.class
#	target/test-classes/linked.ll

# Conflicts:
#	target/classes/cn/edu/nju/software/ir/instruction/BitCast.class