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.
This was hidden in urbit-os-v1.0.44 until we could ensure it actually
logged you out of all sessions. It requires a hidden input to function,
so it's added here.
Fixes#2649.
* origin/la/file-server-fix:
file-server: fix %file-server by adding SPA flag and threading is-file through request
Signed-off-by: Matilde Park <matilde.park@sunshinegardens.org>
* origin/lf/settings-screen: (25 commits)
interface: fix setting background color
interface/api: fix s3 calls for setting endpoint, keys
interface/profile: hide log out of all header
interface/profile: hide 'log out of all'
profile: address comments
profile: add identity form
publish,links: respect hide avatar and nickname settings
StatusBar: update for new design
chat: support hideAvatars and hideNicknames
launch: add background to base hash
StatusBar: update for profile + omnibox
interface: breakpoints in px
settings: refactor for line limit
settings: add inline image upload
settings: add drag and drop component to reorder tiles
groups,dojo: fix transparencies
clock: fix transparency on no location
profile: refactor layout
interface: change indigo breakpoints to old queries
interface: handle transparency correctly
...
Signed-off-by: Matilde Park <matilde.park@sunshinegardens.org>
