jnl.0 #1

# Change User Description Committed
#1 10825 Paul Allen Branching using paul_allen.p4convert
//guest/perforce_software/p4convert/test/com/perforce/integration/dumps/sub_conflict/jnl.0
#1 10545 Paul Allen TestCase: sub_conflict