{"thread":{"id":"6073","subject":"[PATCH] Use git-merge-file in git-merge-one-file, too","startedAt":"2006-12-22T02:20:55Z","lastAt":"2006-12-22T02:20:55Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"30002","messageId":"Pine.LNX.4.63.0612220320340.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6073","inReplyTo":null,"subject":"[PATCH] Use git-merge-file in git-merge-one-file, too","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-22T02:20:55Z","receivedAt":"2006-12-22T02:20:55Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nWould you believe? I edited git-merge-one-file (note the missing \".sh\"!)\nwhen I submitted the patch which became commit e2b7008752...\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n git-merge-one-file.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-merge-one-file.sh b/git-merge-one-file.sh\nindex c49e4c6..7d62d79 100755\n--- a/git-merge-one-file.sh\n+++ b/git-merge-one-file.sh\n@@ -104,7 +104,7 @@ case \"${1:-.}${2:-.}${3:-.}\" in\n \t# Be careful for funny filename such as \"-L\" in \"$4\", which\n \t# would confuse \"merge\" greatly.\n \tsrc1=`git-unpack-file $2`\n-\tmerge \"$src1\" \"$orig\" \"$src2\"\n+\tgit-merge-file \"$src1\" \"$orig\" \"$src2\"\n \tret=$?\n \n \t# Create the working tree file, using \"our tree\" version from the\n-- \n1.4.4.2.gd74c-dirty\n"}]}