diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-15 22:50:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-16 23:45:33 -0800 |
| commit | 88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e (patch) | |
| tree | 4eead9d7f1d7fb95b0fe6f367fbf4a330f2c485d /t/t4013/diff.format-patch_--inline_--stdout_initial..side | |
| parent | merge-tree: use ll_merge() not xdl_merge() (diff) | |
| download | git-88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e.tar.gz git-88533f6d64ae898e5f94fa22fa9b5fd43fe3e16e.zip | |
rerere: use ll_merge() instead of using xdl_merge()
This allows us to pay attention to the attribute settings and custom
merge driver the user sets up.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..side')
0 files changed, 0 insertions, 0 deletions