projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0bed189) | patch
[PATCH] More descriptive messages for conflict cases in merges
authorFredrik Kuivinen <freku045@student.liu.se>
Sun, 25 Sep 2005 14:49:02 +0000 (16:49 +0200)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 23:08:54 +0000 (16:08 -0700)
commit8cc01e5019e0dc9a86bba4cba414b46627fe0424
tree39fe301791ff723b32fdfcb87d49c7ee1e10c6catree | snapshot
parent0bed18998ae6c0cec1485e6295be16a4fcebc7a7commit | diff
[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>
git-merge.sh diff | blob | history
The core git plumbing