diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 19:57:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 19:57:19 (GMT) |
| commit | cb99be7c7d2afc71106ffaf400c769c8e72f1bb2 (patch) | |
| tree | 66a78ff99d45bf4c9c1dba5867c48c08b0b44df5 /merge-tree.c | |
| parent | 722f53ca2feed5e41c2270fdaae25bde5b7582f4 (diff) | |
| parent | ee95ec5d58d536243966de6ee810d345074b755e (diff) | |
| download | git-cb99be7c7d2afc71106ffaf400c769c8e72f1bb2.zip git-cb99be7c7d2afc71106ffaf400c769c8e72f1bb2.tar.gz git-cb99be7c7d2afc71106ffaf400c769c8e72f1bb2.tar.bz2 | |
Merge branch 'js/merge'
* js/merge:
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions