| Age | Commit message (Expand) | Author |
|---|---|---|
| 2019-10-24 | apply: respect merge.conflictStyle in --3way | Denton Liu |
| 2019-10-24 | t4108: demonstrate bug in apply | Denton Liu |
| 2019-10-24 | t4108: use `test_config` instead of `git config` | Denton Liu |
| 2019-10-24 | t4108: remove git command upstream of pipe | Denton Liu |
| 2019-10-24 | t4108: replace create_file with test_write_lines | Denton Liu |
| 2012-07-10 | 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 |
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |