summaryrefslogtreecommitdiff
path: root/Documentation/git-resolve.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-12-24 00:02:08 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-24 00:02:08 -0800
commit6ab58895cd951f6f5c96fa432afb122cfeb12746 (patch)
tree2a708aa291f58887198d3951e342996b2257e88f /Documentation/git-resolve.txt
parentGIT 1.0.3 (diff)
parentmailinfo: iconv does not like "latin-1" -- should spell it "latin1" (diff)
downloadtgif-6ab58895cd951f6f5c96fa432afb122cfeb12746.tar.xz
GIT 1.0.4
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-resolve.txt')
0 files changed, 0 insertions, 0 deletions