summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-11-25 16:35:20 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-11-25 16:35:20 -0800
commit93dcab2937624ebb97f91807576cddb242a55a46 (patch)
tree8d16464f16866a7f215401a95f8bdaa124799d49 /git-merge-resolve.sh
parentMerge branch 'master' (diff)
parentgit-sh-setup: move the repository check to a core program. (diff)
downloadtgif-93dcab2937624ebb97f91807576cddb242a55a46.tar.xz
GIT 0.99.9k
This is not 1.0rc4 yet, but to push the recent fixes out. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions