t / t5100 / embed-from.expecton commit t1404: add a bunch of tests of D/F conflicts (2e9de01)
   1Author: Commit Author
   2Email: commit@example.com
   3Subject: patch subject
   4Date: Sat, 13 Sep 2014 21:13:23 -0400 
   5