| commit | 9c0012e738a9c51e5a2d1a32d88c9a6b4d547195 | [log] [tgz] |
|---|---|---|
| author | Gabor Greif <ggreif@gmail.com> | Fri Apr 02 00:08:26 2010 +0000 |
| committer | Gabor Greif <ggreif@gmail.com> | Fri Apr 02 00:08:26 2010 +0000 |
| tree | 260bb0c2ecd723b30ff2080f6c82b28a999dcbc8 | |
| parent | a4ae3a100d83a716dff81be7af7db5eb354517dc [diff] |
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