Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen | 2005-09-13 | 1 | -429/+0 |
* | [PATCH] Make sure we die if we don't get enough arguments. | Fredrik Kuivinen | 2005-09-12 | 1 | -0/+3 |
* | [PATCH] Introduce a 'die' function. | Fredrik Kuivinen | 2005-09-12 | 1 | -10/+5 |
* | [PATCH] Exit with status code 2 if we get an exception. | Fredrik Kuivinen | 2005-09-12 | 1 | -7/+12 |
* | [PATCH] Fix assertion failure when merging common ancestors. | Fredrik Kuivinen | 2005-09-12 | 1 | -1/+1 |
* | Add a new merge strategy by Fredrik Kuivinen. | Junio C Hamano | 2005-09-10 | 1 | -0/+426 |