Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge: detect delete/modechange conflictjk/delete-modechange-conflict | Jeff King | 2015-10-26 | 1 | -0/+23 |
* | t6031: generalize for recursive and resolve strategies | Jeff King | 2015-10-26 | 1 | -0/+77 |
index : delta/git.git | ||
github.com: git/git.git |
summaryrefslogtreecommitdiff |
Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge: detect delete/modechange conflictjk/delete-modechange-conflict | Jeff King | 2015-10-26 | 1 | -0/+23 |
* | t6031: generalize for recursive and resolve strategies | Jeff King | 2015-10-26 | 1 | -0/+77 |