Merge "Added MERGING_RESOLVED repository state"
commit541ad72ac6a6529e20fb1b0694c592c0bcc98d38
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Sat, 8 May 2010 21:16:26 +0000 (8 17:16 -0400)
committerCode Review <codereview-daemon@eclipse.org>
Sat, 8 May 2010 21:16:26 +0000 (8 17:16 -0400)
tree86924dba53581c2986bf380dc4bf8239f02b26d3
parent0df679aea175aaba322416e586535ac877eba9a8
parentb9ab040b45f0a0329d76fc919b0111414fdaf035
Merge "Added MERGING_RESOLVED repository state"