Lines Matching refs:merge
9 * merge conflicts with upstream on those parts.
11 * The file contains useful hints when we try to resolve future 3-way merge
25 * Recent downstreaming on 2013/3/18: Synced to r177342 (Contact srhines for merge questions.)
26 * Recent downstreaming on 2013/3/5: Synced to r176139 (Contact srhines for merge questions.)
27 * Recent downstreaming on 2013/1/8: Synced to r171905 (Contact srhines for merge questions.)
28 * Recent downstreaming on 2012/8/23: Synced to r162314 (Contact srhines for merge questions.)
29 * Recent downstreaming on 2012/8/3: Synced to r160668 (Contact sliao for merge questions.)
30 * Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/llvm/trunk@157317 (Contact srhines for merge questions.)
31 * Recent downstreaming on 2012/4/24: Synced to r155090 (Contact sliao for merge questions.)
32 * Recent downstreaming on 2012/3/24: Synced to r153224 (Contact sliao & srhines for merge questions.)
33 * Recent downstreaming on 2012/3/5: Synced to r152063 (Contact srhines & sliao for merge questions.)
34 * Recent downstreaming on 2011/12/17: Synced to r146714 (Contact loganchien & sliao for merge questions.)
35 * Recent downstreaming on 2011/11/26: Synced to r145126 (Contact loganchien & sliao for merge questions.)
36 * Recent downstreaming on 2011/11/17: Synced to r144606 (Contact loganchien & sliao for merge questions.)
37 * Recent downstreaming on 2011/11/14: Synced to r144354 (Contact srhines for merge questions.)
38 * Recent downstreaming on 2011/10/22: Synced to r142530 (Contact sliao & loganchien for merge questions.)
39 * Recent downstreaming on 2011/7/21: Synced to r135569 (Contact sliao & loganchien for merge questions.)
40 * Recent downstreaming on 2011/7/19: Synced to r135360 (Contact sliao for merge questions.)
41 * Recent downstreaming on 2011/7/2: Synced to r134306 (Contact sliao for merge questions.)
42 * Recent downstreaming on 2011/6/30: Synced to r133718 (Contact sliao for merge questions.)
55 * Recent downstreaming on 2011/6/22: Synced to r133240 (Contact sliao@ for merge questions.)
56 * Recent downstreaming on 2011/4/8: Synced to r129128 (Contact sliao@ for merge questions.)
57 * Recent downstreaming on 2011/3/11: Synced from r119309 to r127116 (Contact sliao@ for merge questions.)
