| Age | Commit message (Expand) | Author |
|---|---|---|
| 2021-08-25 | Support `git config merge.conflictStyle diff3` | Ryooooooga |
| 2021-06-05 | prevent closure issue | Jesse Duffield |
| 2021-06-05 | More generic merge conflict detection | Cristian Betivu |
| 2021-05-30 | Handle alternate merge conflict format; add tests | Harrison Jones |
 |
index : lazygit | |
| Mirror of https://github.com/jesseduffield/lazygit | matthias |
| summaryrefslogtreecommitdiffstats |