DESCRIPTION

Merge branch 'stable-1.2'

* stable-1.2:
  Don't show files message if no failing paths
  RebaseOperation: add missing refresh
  PullOperation: add missing resource refresh
  Use different maven repository to get signing plugin
  Do not recurse into .git directory when searching projects
  Show proper message when merge hits checkout conflicts

Change-Id: Ib27a8fe182e3785ade897d845597207ce12daa1b
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2011-12-16 09:17:20.000000000

Patch Set 1: Looks good to me, approved; Build Successful; IP review completed



-------------------------------------
author: Douglas Trujillo
date: 2011-12-16 09:17:21.000000000

Change has been successfully merged into the git repository.

-------------------------------------
