diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:24 -0800 |
| commit | c566ea13fd25be8a7c20bdf3644d1ebe3f65b690 (patch) | |
| tree | 90662464e689e56c23333d0041cdce7974e16a77 /git-difftool.perl | |
| parent | 98294e9875c05cdf2d4f16d446cb89ba6d41014a (diff) | |
| parent | 35ffe7583108ab236dcf81226690388491d9962f (diff) | |
| download | git-c566ea13fd25be8a7c20bdf3644d1ebe3f65b690.tar.gz | |
Merge branch 'jc/merge-blobs'
Update the disused merge-tree proof-of-concept code.
* jc/merge-blobs:
merge-tree: fix d/f conflicts
merge-tree: add comments to clarify what these functions are doing
merge-tree: lose unused "resolve_directories"
merge-tree: lose unused "flags" from merge_list
Which merge_file() function do you mean?
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions