summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-19 22:41:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-19 22:41:55 (GMT)
commitb8950769b8b91d634ec549fd1af792ccc1864f79 (patch)
tree9c1f18332894c18f404932ad11be32d401fbe5eb /diff-lib.c
parentba580aeafb52921025de1efe1c50db34393f9907 (diff)
parent61c2bcbd11e3b66a328b3850c01592e5dc1c67bb (diff)
downloadgit-b8950769b8b91d634ec549fd1af792ccc1864f79.zip
git-b8950769b8b91d634ec549fd1af792ccc1864f79.tar.gz
git-b8950769b8b91d634ec549fd1af792ccc1864f79.tar.bz2
Merge branch 'maint'
* maint: pre-commit hook: complain about conflict markers. git-merge: a bit more readable user guidance.
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions