Code

History

Commits on lael to sys/src/cmd/diff/merge3.c13
  1. merge3: remove unnecessary variablesOri Bernstein committed 2 years agoa019283
  2. merge3: fix funny merge cases and crashesOri Bernstein committed 2 years ago800417f
  3. merge3: clamp aligned lines to be within the file.Ori Bernstein committed 2 years agocc230c9
  4. merge3: correctly handle 1-based closed intervalsOri Bernstein committed 2 years ago2c395c9
  5. merge3: fix assert in merge of identical deletionsOri Bernstein committed 2 years ago3101971
  6. merge3: fix exit conditions -- l, r are never nilOri Bernstein committed 2 years agoe51beae
  7. diff(1): docuemnt merge3Ori Bernstein committed 2 years agod33611e
  8. merge3: make identical changes merge cleanlyOri Bernstein committed 2 years ago19b75b5
  9. git/fs: preserve mode bits when walking branch dirsOri Bernstein committed 3 years ago1cf7cb0
  10. merge3: handle edge cases where we remove linesOri Bernstein committed 3 years agoebf5087
  11. merge3: overlap happens on the source offsets, not the dest offsetsOri Bernstein committed 3 years ago33d139d
  12. diff: barf with explanation on binary diffs/mergesOri Bernstein committed 3 years agof731393
  13. diff, merge3: refactor diff, implement merge3Ori Bernstein committed 3 years agod47d312

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t