xdl_merge(): add optional ancestor label to diff3-style output
[git.git] / t / .gitignore
blob7dcbb232cd876cb7b976443cc586f60a94ab92bf
1 /trash directory*
2 /test-results