diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-04 00:54:32 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 00:54:32 +0400 |
commit | 8ed64dfe7377971963182e9cfcd4b8da82337438 (patch) | |
tree | bbfdeb60226b3f415d15f567d3aac4ee06054abd /xdiff/xprepare.h | |
parent | e230c568c4b9a991e3175e5f65171a566fd8e39c (diff) | |
parent | e5be297279e8ee8c503eb59da21ab17edc40e748 (diff) |
Merge branch 'maint-1.8.3' into maint
* maint-1.8.3:
fix shell syntax error in template
Diffstat (limited to 'xdiff/xprepare.h')
0 files changed, 0 insertions, 0 deletions