diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-03-03 14:56:13 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-03 14:56:13 -0800 |
commit | 6d84bcb5de78251d98f7d3e80e822d9a4b8f4df3 (patch) | |
tree | 57c3291c571c0a3d3cc66b151afeb45811f8fdf1 /xdiff/xemit.h | |
parent | Merge branch 'jh/maint-submodule-status-in-void' (early part) (diff) | |
parent | Start preparing for 1.7.0.2 (diff) | |
download | tgif-6d84bcb5de78251d98f7d3e80e822d9a4b8f4df3.tar.xz |
Merge branch 'maint'
* maint:
Start preparing for 1.7.0.2
Conflicts:
RelNotes
Diffstat (limited to 'xdiff/xemit.h')
0 files changed, 0 insertions, 0 deletions