tree 12b97692a366165e945e9051d00fe449551dc5c8
parent 2822658a3912b2468cd5b48d5556ea5232dcb23b
author Tim Van Steenburgh <tvansteenburgh@gmail.com> 1388700553 +0000
committer Tim Van Steenburgh <tvansteenburgh@gmail.com> 1388700553 +0000

[#6896] Update test example; comment merge instructions

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>