| commit | 39d8e271f42e976a61f08a4f7bc2047a682ac532 | |
| author | Clemens Buchacher <drizzd@aon.at> | |
| Sun, 5 Apr 2009 00:47:00 +0000 (5 02:47 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 5 Apr 2009 07:26:33 +0000 (5 00:26 -0700) | ||
| tree | dbf1f297e9e8716ae66e903933e9b3a8af0928c1 | treesnapshot (tar.gz zip) |
| parent | 0eb6574c24241b1e54be1ddff60287544faaf8d8 | commitdiff |
simplify output of conflicting merge
This simplifies the code without changing the semantics and removes
the unhelpful "needs $sha1" part of the conflicting submodule message.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This simplifies the code without changing the semantics and removes
the unhelpful "needs $sha1" part of the conflicting submodule message.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |