summaryrefslogtreecommitdiff
path: root/templates/hooks--pre-commit
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-19 21:54:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-19 22:37:36 (GMT)
commit50ac7408018209a2829b7948119270fec7e14ec8 (patch)
tree8e1ee8477575ce9f7891b6a47f01b7b4ffb66fba /templates/hooks--pre-commit
parent23edecbc9a5566ac5aa8fb251fbcf8bb83694837 (diff)
downloadgit-50ac7408018209a2829b7948119270fec7e14ec8.zip
git-50ac7408018209a2829b7948119270fec7e14ec8.tar.gz
git-50ac7408018209a2829b7948119270fec7e14ec8.tar.bz2
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 'templates/hooks--pre-commit')
0 files changed, 0 insertions, 0 deletions