summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <casey@nrlssc.navy.mil>2008-08-07 14:03:42 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-08 13:17:25 -0700
commitc94c8e5ff63728a60494cbbcb28d5045584a997b (patch)
treefaf80bdb37b5ecf42d4806c4ca2f97bf8094a8e2 /merge-file.c
parentDocumentation: user-manual: "git commit -a" doesn't motivate .gitignore (diff)
downloadtgif-c94c8e5ff63728a60494cbbcb28d5045584a997b.tar.xz
Makefile: set SHELL to value of SHELL_PATH
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions