| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | build: make code "-Wpointer-arith" clean | Junio C Hamano | 2010-02-01 | 1 | -2/+2 |
| * | resolve-undo: "checkout -m path" uses resolve-undo information | Junio C Hamano | 2009-12-25 | 1 | -0/+59 |
| * | resolve-undo: record resolved conflicts in a new index extension section | Junio C Hamano | 2009-12-25 | 1 | -0/+117 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/resolve-undo.c