| Age | Commit message (Expand) | Author |
|---|---|---|
| 2018-08-29 | rerere: mention caveat about unmatched conflict markers | Thomas Gummerer |
| 2018-08-06 | rerere: teach rerere to handle nested conflicts | Thomas Gummerer |
| 2018-08-06 | rerere: add documentation for conflict normalization | Thomas Gummerer |
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |