aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 20:21:55 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-21 22:04:42 -0800
commit55b6745d633b9501576eb02183da0b0fb1cee964 (patch)
tree32f6d0a3026466c9a04438387f0f7701b88f0245 /merge-file.c
parent8b187e6b0e114055071a9ae8f56b9a2a24bfaf8f (diff)
downloadgit-55b6745d633b9501576eb02183da0b0fb1cee964.tar.gz
git-55b6745d633b9501576eb02183da0b0fb1cee964.tar.xz
make "git var" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions