| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge-recursive: Add copyright notice | Fredrik Kuivinen | 2005-11-11 | 1 | -0/+4 |
| * | [PATCH] Enable and fix support for base less merges. | Fredrik Kuivinen | 2005-10-03 | 1 | -1/+1 |
| * | Ship our own copy of subprocess.py | Junio C Hamano | 2005-09-19 | 1 | -6/+0 |
| * | [PATCH] Use the 'die' function where it is appropriate. | Fredrik Kuivinen | 2005-09-13 | 1 | -14/+13 |
| * | [PATCH] Make the ProgramError class printable. | Fredrik Kuivinen | 2005-09-12 | 1 | -0/+3 |
| * | [PATCH] Introduce a 'die' function. | Fredrik Kuivinen | 2005-09-12 | 1 | -4/+8 |
| * | Add a new merge strategy by Fredrik Kuivinen. | Junio C Hamano | 2005-09-10 | 1 | -0/+268 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/gitMergeCommon.py