summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Toby Allsopp <Toby.Allsopp@navman.co.nz>2008-02-05 09:41:43 +1300
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-02-07 00:39:08 -0800
commit053d9e432be246a389fb8adaa0c88e7c791f8b21 (patch)
treeab21088db9b03e081a66728a5ea9f60e5f1d04f8 /merge-index.c
parentMerge branch 'maint' (diff)
downloadtgif-053d9e432be246a389fb8adaa0c88e7c791f8b21.tar.xz
git-p4: Fix indentation from tab to spaces
Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions