diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-11 10:52:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 10:52:59 -0800 |
| commit | 631ba3090714a9786457dd39da8ed50925715432 (patch) | |
| tree | 3119b68e566c36f5a137d8dbbe217892418eb1d3 /git-merge-recursive.py | |
| parent | 592ee97d8fffa2318960074057e044709163abf7 (diff) | |
| parent | 4bc51db0feb4a93a285d6333f206cad77c83ed57 (diff) | |
| parent | 53de71f88b0d5a55892c19b412688548f5797f0b (diff) | |
| download | git-631ba3090714a9786457dd39da8ed50925715432.tar.gz | |
Merge branches 'jc/sb' and 'jc/mb'