]> git.ipfire.org Git - thirdparty/git.git/commit - git-merge-one-file.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ac9f71c) | patch
Clarify kind of conflict in merge-one-file helper
authorAlex Riesen <raa.lkml@gmail.com>
Wed, 29 Apr 2009 21:40:50 +0000 (23:40 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 May 2009 07:27:39 +0000 (00:27 -0700)
commit718135e3b6b5317f763477f5b0f408d888d79a8e
treea4f09602d6c5e5511e220b3fdd4d2027d886fe3dtree | snapshot
parentac9f71cf766ab1affdfc4d4c4b58238bf9c76700commit | diff
Clarify kind of conflict in merge-one-file helper

Not as verbose as the recursive merge driver, but better still.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge-one-file.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.