| Age | Commit message (Expand) | Author |
|---|---|---|
| 2005-09-12 | [PATCH] Make sure we die if we don't get enough arguments. | Fredrik Kuivinen |
| 2005-09-12 | [PATCH] Introduce a 'die' function. | Fredrik Kuivinen |
| 2005-09-12 | [PATCH] Exit with status code 2 if we get an exception. | Fredrik Kuivinen |
| 2005-09-12 | [PATCH] Fix assertion failure when merging common ancestors. | Fredrik Kuivinen |
| 2005-09-11 | Add a new merge strategy by Fredrik Kuivinen. | Junio C Hamano |
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |
path: root/git-merge-fredrik.py