aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-26 21:52:26 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-26 21:52:26 -0700
commit9b1054d93e7e8564d0d9865cb7118cb6e756c74b (patch)
tree0b9de3569b26589e6fa265e15d1ed204828ce069 /merge-recursive.h
parente6202dfe0021e2662eb4e19e6d01e33081608b5e (diff)
parent6e74e075d25aea67cf973e456a6804c0c3741235 (diff)
downloadgit-9b1054d93e7e8564d0d9865cb7118cb6e756c74b.tar.gz
git-9b1054d93e7e8564d0d9865cb7118cb6e756c74b.tar.xz
Merge branch 'jp/send-email-to-cmd'
* jp/send-email-to-cmd: git-send-email.perl: Add --to-cmd Conflicts: git-send-email.perl
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions