merge_trees(): add ancestor label parameter for diff3-style output
[git/debian.git] / t / t9700 / 
treea02e67e8de75c23f2abed64a10bc608041ba29d9
drwxr-xr-x   ..
-rwxr-xr-x 4627 test.pl