| 2005-09-14 | Merge branch 'master' of . | blob | diff | raw | |
| 2005-09-14 | git-merge-recursive: Trivial RE fixes. | blob | diff | raw | |
| 2005-09-13 | [PATCH] Use a temporary index file when we merge the... | blob | diff | raw | diff to current | |
| 2005-09-13 | [PATCH] Adjust git-merge-recursive.py for the new tool... | blob | diff | raw | diff to current | |
| 2005-09-13 | [PATCH] Don't output 'Automatic merge failed, ...' | blob | diff | raw | diff to current | |
| 2005-09-13 | [PATCH] Be more like the 'resolve' strategy. | blob | diff | raw | diff to current | |
| 2005-09-13 | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | blob | diff | raw | diff to current | |