| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | [PATCH] Be more like the 'resolve' strategy. | Fredrik Kuivinen | 2005-09-13 |
| * | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen | 2005-09-13 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/git-merge-recursive.py