Tomas Ekeli on Nostr: npub1upkp7…4tcwy i really like the 4-pane view that perforce merge has. it shows ...

npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) i really like the 4-pane view that perforce merge has.

it shows (naming is hard)
- remote change
- last common ancestor
- local change
and then (under those)
- what your choices will result in

the tool is free, i believe, but maybe not open-source