| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2005-10-03 | [PATCH] Enable and fix support for base less merges. | Fredrik Kuivinen | 1 | -0/+6 |
| 2005-09-10 | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 1 | -35/+3 |
| 2005-09-10 | Multi-backend merge driver. | Junio C Hamano | 1 | -0/+80 |
 |
index : git.git | |
| The core git plumbing | Junio C. Hamano |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/git-merge-resolve.sh