summaryrefslogtreecommitdiff
path: root/update-ref.c
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-09-25 14:49:02 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-25 23:08:54 (GMT)
commit8cc01e5019e0dc9a86bba4cba414b46627fe0424 (patch)
tree39fe301791ff723b32fdfcb87d49c7ee1e10c6ca /update-ref.c
parent0bed18998ae6c0cec1485e6295be16a4fcebc7a7 (diff)
downloadgit-8cc01e5019e0dc9a86bba4cba414b46627fe0424.zip
git-8cc01e5019e0dc9a86bba4cba414b46627fe0424.tar.gz
git-8cc01e5019e0dc9a86bba4cba414b46627fe0424.tar.bz2
[PATCH] More descriptive messages for conflict cases in merges
The merge strategies can give more descriptive error messages for conflict cases if they are given the actual branch names instead of the SHA1s. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'update-ref.c')
0 files changed, 0 insertions, 0 deletions