diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-02-25 23:21:42 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-02-25 23:21:42 -0800 |
commit | 64da6e20de1f2246e2d8d9d85e53ca3cbf393212 (patch) | |
tree | 008639f6933b670039242a140a2ca659fd37bb37 /xdiff/xdiffi.c | |
parent | commit: quote the user name in the example (diff) | |
parent | t3301-notes: insert a shbang line in ./fake_editor.sh (diff) | |
download | tgif-64da6e20de1f2246e2d8d9d85e53ca3cbf393212.tar.xz |
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6:
t3301-notes: insert a shbang line in ./fake_editor.sh
Diffstat (limited to 'xdiff/xdiffi.c')
0 files changed, 0 insertions, 0 deletions