git - git

	Commit message (Expand)	Author	Files	Lines
2010-03-21	xdl_merge(): move file1 and file2 labels to xmparam structure	Jonathan Nieder	4	-13/+20
2010-03-21	xdl_merge(): add optional ancestor label to diff3-style output	Jonathan Nieder	2	-2/+15