diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:32 -0700 |
| commit | 1ad4b17b069a7b692ab801bda37c5ab35ef0208e (patch) | |
| tree | ef5b1882b491f189681538b5f473c34e7cbff3cf /daemon.c | |
| parent | b76c561a74cd366786b7b762795fba1551b42149 (diff) | |
| parent | 15a31e78852f4ede5335552875006daeedfc3aa7 (diff) | |
| download | git-1ad4b17b069a7b692ab801bda37c5ab35ef0208e.tar.gz | |
Merge branch 'sc/difftool-skip'
* sc/difftool-skip:
t7800: avoid arithmetic expansion notation
git-difftool: allow skipping file by typing 'n' at prompt
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions