summaryrefslogtreecommitdiff
path: root/Documentation/git-resolve.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-10-23 02:04:01 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-10-23 02:04:01 -0700
commita1c7a69047e88244ed321b5aa2a8bcbba5a869c2 (patch)
tree50e12a824ab58ff81820616e2d548a86990e4ed3 /Documentation/git-resolve.txt
parentMerge branch 'fixes' (diff)
downloadtgif-a1c7a69047e88244ed321b5aa2a8bcbba5a869c2.tar.xz
GIT 0.99.8g
Primarily to update the maintenance branch deployed on kernel.org machines with the git-daemon updates. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-resolve.txt')
0 files changed, 0 insertions, 0 deletions