summaryrefslogtreecommitdiff
path: root/symbolic-ref.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-19 14:54:27 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-19 15:37:36 -0700
commit50ac7408018209a2829b7948119270fec7e14ec8 (patch)
tree8e1ee8477575ce9f7891b6a47f01b7b4ffb66fba /symbolic-ref.c
parentDocument git-clone --reference (diff)
downloadtgif-50ac7408018209a2829b7948119270fec7e14ec8.tar.xz
git-merge: a bit more readable user guidance.
We said "fix up by hand" after failed automerge, which was a big "Huh? Now what?". Be a bit more explicit without being too verbose. Suggested by Carl Worth. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'symbolic-ref.c')
0 files changed, 0 insertions, 0 deletions