Commit message (Expand) | Author | Age | |
---|---|---|---|
* | merge: detect delete/modechange conflict | Jeff King | 2015-10-26 |
* | t6031: generalize for recursive and resolve strategies | Jeff King | 2015-10-26 |
index : org/kernel/git.git | ||
forked from git/git | git |
aboutsummaryrefslogtreecommitdiff |
Commit message (Expand) | Author | Age | |
---|---|---|---|
* | merge: detect delete/modechange conflict | Jeff King | 2015-10-26 |
* | t6031: generalize for recursive and resolve strategies | Jeff King | 2015-10-26 |