aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2010-04-02 00:08:26 +0000
committerGabor Greif <ggreif@gmail.com>2010-04-02 00:08:26 +0000
commit519451aa397ce7dd8cf7ed0c1dcd38534bba798a (patch)
tree260bb0c2ecd723b30ff2080f6c82b28a999dcbc8
parentcd530fbf416802333ebab6011acc93f4b5879ba0 (diff)
downloadexternal_llvm-519451aa397ce7dd8cf7ed0c1dcd38534bba798a.zip
external_llvm-519451aa397ce7dd8cf7ed0c1dcd38534bba798a.tar.gz
external_llvm-519451aa397ce7dd8cf7ed0c1dcd38534bba798a.tar.bz2
remove these merge-tracking properties as they
might interfere with merges to other branches (as Dan pointed out) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100157 91177308-0d34-0410-b5e6-96231b3b80d8
0 files changed, 0 insertions, 0 deletions