Andrew's git / gitweb.git / t/t4100/t-apply-4.expect
?
t / t4100 / t-apply-4.expecton commit checkout --conflict=diff3: add a label for ancestor (f0531a2)
   1 t/t0000-basic.sh |    0 
   2 t/test-lib.sh    |    0 
   3 2 files changed, 0 insertions(+), 0 deletions(-)
   4 mode change 100644 => 100755 t/t0000-basic.sh
   5 mode change 100644 => 100755 t/test-lib.sh