DESCRIPTION

Add wording in merge dialogue indicating merge direction

Bug 333480

Change-Id: Id2dd5e87a3528591068ee08227abd635b6a3220b
Signed-off-by: Juliet Cantu xxx@xxx.xxx


COMMENTS

author: Juliet Cantu
date: 2011-01-07 10:28:47.000000000

Uploaded patch set 3.

-------------------------------------
author: Douglas Trujillo
date: 2011-01-08 23:37:55.000000000

Patch Set 3: (1 inline comment)



Line:9, /COMMIT_MSG -> I think we want all footers in last paragraph, also add colon

s/Bug 333480\n\n/Bug: 333480\n/

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