Commit message (Expand) | Author | Age | |
---|---|---|---|
* | apply: tests for the --3way option | Junio C Hamano | 2012-07-09 |
* | apply: allow rerere() to work on --3way results | Junio C Hamano | 2012-07-09 |
* | apply: register conflicted stages to the index | Junio C Hamano | 2012-07-09 |
index : org/kernel/git.git | ||
forked from git/git | git |
aboutsummaryrefslogtreecommitdiff |
Commit message (Expand) | Author | Age | |
---|---|---|---|
* | apply: tests for the --3way option | Junio C Hamano | 2012-07-09 |
* | apply: allow rerere() to work on --3way results | Junio C Hamano | 2012-07-09 |
* | apply: register conflicted stages to the index | Junio C Hamano | 2012-07-09 |