DESCRIPTION

Show error message in commit dialog if MERGE_MSG is missing

An error message is shown in the commit dialog if the file MERGE_MSG is
missing. Same applies for the Staging View.

Bug: 352243
Change-Id: Ia01e91bcbbfbc474e12cf5519bf41d98b05aaed2
Signed-off-by: Marlie Beasley xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2011-09-05 06:52:56.000000000

Uploaded patch set 3.

-------------------------------------
author: Douglas Trujillo
date: 2011-09-05 06:56:00.000000000

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

- rebased and resolved conflict
- improved error message

-------------------------------------
author: Douglas Trujillo
date: 2011-09-05 06:56:01.000000000

Change has been successfully merged into the git repository.

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