Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-11-17 | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland | 1 | -0/+145 |
2010-11-17 | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland | 1 | -0/+502 |