DESCRIPTION

Merge tool: skip ignored resources when building the diff

Ignored resources should not appear in the Merge tool.

Bug: 330983
Change-Id: I8fb19e78bb42a7684920945fdccc22ebec7098f6
Signed-off-by: Willow Cantrell xxx@xxx.xxx


COMMENTS

author: Willow Cantrell
date: 2011-02-03 14:37:20.000000000

Uploaded patch set 2.

-------------------------------------
author: Willow Cantrell
date: 2011-02-03 14:37:53.000000000

Patch Set 2:

Now with NotIgnoredFilter. Thanks Chris.

-------------------------------------
author: Malia Sampson
date: 2011-02-03 15:09:41.000000000

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

Looks good now :)

-------------------------------------
author: Malia Sampson
date: 2011-02-03 15:09:42.000000000

Change has been successfully merged into the git repository.

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