| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | apply: respect merge.conflictStyle in --3way | Denton Liu | 2019-10-24 | 1 | -1/+1 |
| * | t4108: demonstrate bug in apply | Denton Liu | 2019-10-24 | 1 | -2/+11 |
| * | t4108: use `test_config` instead of `git config` | Denton Liu | 2019-10-24 | 1 | -1/+1 |
| * | t4108: remove git command upstream of pipe | Denton Liu | 2019-10-24 | 1 | -6/+7 |
| * | t4108: replace create_file with test_write_lines | Denton Liu | 2019-10-24 | 1 | -17/+10 |
| * | apply: tests for the --3way option | Junio C Hamano | 2012-07-10 | 1 | -0/+54 |
| * | apply: allow rerere() to work on --3way results | Junio C Hamano | 2012-07-09 | 1 | -0/+25 |
| * | apply: register conflicted stages to the index | Junio C Hamano | 2012-07-09 | 1 | -0/+78 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |