Age | Commit message (Expand) | Author |
---|---|---|
2010-11-17 | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland |
2010-11-17 | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland |
index : git | ||
Git: sistema de control de versiones | mirror |
summaryrefslogtreecommitdiff |
Age | Commit message (Expand) | Author |
---|---|---|
2010-11-17 | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" | Johan Herland |
2010-11-17 | git notes merge: Add automatic conflict resolvers (ours, theirs, union) | Johan Herland |