diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-09 19:16:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-09 19:16:33 -0700 |
| commit | d5b0c9ea178dab3599674ccff50645c0464b8c31 (patch) | |
| tree | a35b27b04d18022ea4731941ea2a1bedce998092 /git-merge-recursive.py | |
| parent | f8e2c54c9a17af3319e96db1d9e97ace36ae6831 (diff) | |
| parent | fb8024b414b417d85ce215eba3dd23c188500c15 (diff) | |
| download | git-d5b0c9ea178dab3599674ccff50645c0464b8c31.tar.gz git-d5b0c9ea178dab3599674ccff50645c0464b8c31.tar.xz | |
Merge branch 'fixes'
with minor hand resolving on git-tag.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions