Index: llvm/trunk/lib/LLVMBuild.txt
===================================================================
--- llvm/trunk/lib/LLVMBuild.txt
+++ llvm/trunk/lib/LLVMBuild.txt
@@ -16,7 +16,9 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = Analysis AsmParser Bitcode CodeGen DebugInfo ExecutionEngine LineEditor Linker IR IRReader LTO MC Object Option Passes ProfileData Support TableGen Target Transforms
+subdirectories = Analysis AsmParser Bitcode CodeGen DebugInfo ExecutionEngine
+ LineEditor Linker IR IRReader LTO MC Object Option Passes ProfileData Support
+ TableGen Target Transforms
 
 [component_0]
 type = Group
Index: llvm/trunk/lib/Target/LLVMBuild.txt
===================================================================
--- llvm/trunk/lib/Target/LLVMBuild.txt
+++ llvm/trunk/lib/Target/LLVMBuild.txt
@@ -15,8 +15,24 @@
 ;
 ;===------------------------------------------------------------------------===;
 
+; Please keep these as one per line so that out-of-tree merges
+; will typically require only insertion of a line.
 [common]
-subdirectories = ARM AArch64 BPF CppBackend Hexagon MSP430 NVPTX Mips PowerPC R600 Sparc SystemZ X86 XCore
+subdirectories =
+ ARM
+ AArch64
+ BPF
+ CppBackend
+ Hexagon
+ MSP430
+ NVPTX
+ Mips
+ PowerPC
+ R600
+ Sparc
+ SystemZ
+ X86
+ XCore
 
 ; This is a special group whose required libraries are extended (by llvm-build)
 ; with the best execution engine (the native JIT, if available, or the
Index: llvm/trunk/tools/LLVMBuild.txt
===================================================================
--- llvm/trunk/tools/LLVMBuild.txt
+++ llvm/trunk/tools/LLVMBuild.txt
@@ -16,7 +16,10 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = bugpoint llc lli llvm-ar llvm-as llvm-bcanalyzer llvm-cov llvm-diff llvm-dis llvm-dwarfdump llvm-extract llvm-jitlistener llvm-link llvm-lto llvm-mc llvm-nm llvm-objdump llvm-pdbdump llvm-profdata llvm-rtdyld llvm-size macho-dump opt llvm-mcmarkup verify-uselistorder dsymutil
+subdirectories = bugpoint llc lli llvm-ar llvm-as llvm-bcanalyzer llvm-cov
+ llvm-diff llvm-dis llvm-dwarfdump llvm-extract llvm-jitlistener llvm-link
+ llvm-lto llvm-mc llvm-nm llvm-objdump llvm-pdbdump llvm-profdata llvm-rtdyld
+ llvm-size macho-dump opt llvm-mcmarkup verify-uselistorder dsymutil
 
 [component_0]
 type = Group