diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-17 10:33:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-17 10:33:17 +0300 |
| commit | 1589e0517fd22c198799504d6888d5a475024152 (patch) | |
| tree | 3686772961b548988c75edbd53de84a97efeb573 /git.c | |
| parent | 4287307833a7c67b09973fc1023311e473f830b2 (diff) | |
| parent | 2be08a84bae10a0c7ecf2ef921896ce838a6ed0b (diff) | |
Merge branch 'maint'
* maint:
git-merge: finish when git-read-tree fails
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions