summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-17 23:05:34 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-17 23:05:34 -0800
commit5786f4fac7afa881a306e2b771a0307e4ee05384 (patch)
tree34a85245c6cb7e7f09a226b43bb1ec528b138ed3 /merge-recursive.h
parent39d743864bb9a4741f9042d918dcef5c9da21bba (diff)
parenta907e1b6ec3038306df68dc1275edad7457bba4b (diff)
downloadgit-5786f4fac7afa881a306e2b771a0307e4ee05384.tar.gz
Merge branch 'as/autocorrect-alias'
* as/autocorrect-alias: git.c: make autocorrected aliases work
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions