summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-02-18 16:18:43 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-02-18 16:18:43 -0800
commit4bc94d289221e16cccbc72f73b3b5b1de0b822c5 (patch)
tree10b76ca8edbbd63e74935a499d07f64d084e0964 /git-merge.sh
parentDocumentation/i18n.txt: it is i18n.commitencoding not core.commitencoding (diff)
downloadtgif-4bc94d289221e16cccbc72f73b3b5b1de0b822c5.tar.xz
GIT 1.5.0.1
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions