mirror of
https://github.com/urbit/shrub.git
synced 2024-12-29 23:23:52 +03:00
4c758372d6
Barebones 2-way diff thread. Further development should include: - recognize at least %txt and %hoon diff types as (urge:clay cord) and print them prettily - check if they're directories and recurse through them, noting files that exist in one or the other and diffing ones that exist in both - support 3-way diffs. Since we know the desks they're on, we can find a mergebase (see how +trouble gets the base-hash in #3378) and do a 3-way diff. - extend the above to support all the useful diffs, including diff3(a,b), diff2(mergebase(a,b),a) and any other useful ones. |
||
|---|---|---|
| .. | ||
| aqua | ||
| claz | ||
| dns | ||
| eth | ||
| ph | ||
| azimuth-tracker.hoon | ||
| build-cast.hoon | ||
| build-file.hoon | ||
| build-mark.hoon | ||
| diff.hoon | ||
| eth-watcher.hoon | ||
| example-fetch.hoon | ||
| first.hoon | ||
| glob.hoon | ||
| hi.hoon | ||
| migrate-channels.hoon | ||
| read.hoon | ||
| test.hoon | ||
| time.hoon | ||
| tree.hoon | ||
| work.hoon | ||