Log - 4c6c7971e0e42f0f1ce7e9472bc3aec8e0c96650 - jrn/git

1c5e94f tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>' by SZEDER Gábor · 7 years ago
94883b4 merge-tree: handle directory/empty conflict correctly by John Keeping · 12 years ago
ab5f424 merge-tree: fix typo in "both changed identically" by John Keeping · 12 years ago
aacecc3 merge-tree: don't print entries that match "local" by John Keeping · 12 years ago
35ffe75 merge-tree: fix d/f conflicts by Junio C Hamano · 12 years ago
8dd15c6 merge-tree: add comments to clarify what these functions are doing by Junio C Hamano · 12 years ago
21baa6e merge-tree: fix where two branches share no changes by Will Palmer · 15 years ago
f32e985 add basic tests for merge-tree by Will Palmer · 15 years ago