xdl_merge(): move file1 and file2 labels to xmparam structure
[git] / t / t3507-cherry-pick-conflict.sh
2010-03-21  Jonathan Niedertests: document cherry-pick behavior in face of conflicts