DESCRIPTION

Replace with->File in Git Index: ignore untracked files

Executing the "Replace with->File in Git Index" action on
untracked files caused an NPE.
Now untracked files are ignored.

Bug: 333979
Change-Id: I9d99e131a56ab245a2a6e228ba7756f812f1bd21
Signed-off-by: Marlie Beasley xxx@xxx.xxx


COMMENTS

author: Gerrit Johnathan Pham
date: 2011-01-13 14:49:20.000000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
author: Willow Cantrell
date: 2011-01-13 14:50:32.000000000

Uploaded patch set 2.

-------------------------------------
author: Willow Cantrell
date: 2011-01-13 14:50:59.000000000

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

Rebased to current master

-------------------------------------
author: Willow Cantrell
date: 2011-01-13 14:51:00.000000000

Change has been successfully merged into the git repository.

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