OXYGENHUB

README: merge the two descriptions 5e388efbde57 resolution

Author
Andy McCall @andymccall <[email protected]>
When
· 2026-09-26 18:17 UTC
Signature
✔ signed by Andy McCall
Hash
5e388efbde57a5b8196f8470e439108a0eb098bc35002795df862b6910a352f0
Depends on
20247a03a596 576e11916cd8 5b1114a04905 648724d8e0de 91bfb51fbb63 e993a086c13f
Depended on by
d02e545dc265 f4324e406906
In bookmarks
agents-in-readme bare-hashes carried-not-removed carry-identical doctor-trust identical-sides keyless-tags main merge-remote-bookmark only-help-103 paths-for-resolutions-and-amend push-notes show-stat subrepo-pin-state switch-says
In tags
v0.1.0 v0.10.0 v0.11.0 v0.2.0 v0.3.0 v0.3.1 v0.4.0 v0.4.1 v0.4.2 v0.4.3 v0.4.4 v0.4.5 v0.4.6 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0
Edits
2 atoms, 0 tree operations, 1 file

Browse the tree at this change

hide whitespace changes
modified README.md +1 −2
1 1 
# Oxygen
2 2 

    

  
    

      3
      
      -
      
<<<<<<< oxy conflict 1 of 1, side 1 of 2: change c70d345e "README: mention Rust"

    

  
    

      4
      
      -
      
A distributed, commutative version control system written in Rust. See docs/spec.md.

    

  
    

      
      3
      +
      
A distributed, commutative version control system written in Rust for large repositories. See docs/spec.md.

    

  
    

      5
      4
       
      
======= oxy conflict 1 of 1, side 2 of 2: change 11d9a56f "README: mention large repositories"

    

  
    

      6
      5
       
      
A distributed, commutative version control system for large repositories. See docs/spec.md.

    

  
    

      7
      6
       
      
>>>>>>> oxy conflict 1 of 1 end