diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-10-18 13:53:48 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-10-18 13:53:48 -0700 |
commit | 82c41a9bfc843aa2a6e286bcb917b0436714ebd4 (patch) | |
tree | feaa3599c95da8400b179a5618443c66125ee3c6 /vcs-svn/sliding_window.c | |
parent | 6c2bec96a8215bad7745d559c631e45332c5a9ee (diff) | |
parent | 5f737ac91bd869e65bff401ad1108581ac504e22 (diff) | |
download | git-82c41a9bfc843aa2a6e286bcb917b0436714ebd4.tar.gz git-82c41a9bfc843aa2a6e286bcb917b0436714ebd4.tar.xz |
Merge branch 'maint'
* maint:
git-merge: document the -S option
Diffstat (limited to 'vcs-svn/sliding_window.c')
0 files changed, 0 insertions, 0 deletions