{"thread":{"id":"34657","subject":"[PATCH] Documentation/git-merge-file: document option \"--diff3\"","startedAt":"2013-08-09T18:09:32Z","lastAt":"2013-08-09T18:09:32Z","messageCount":1,"participants":["Ralf Thielow"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"224926","messageId":"1376071772-28941-1-git-send-email-ralf.thielow@gmail.com","threadId":"34657","inReplyTo":null,"subject":"[PATCH] Documentation/git-merge-file: document option \"--diff3\"","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2013-08-09T18:09:32Z","receivedAt":"2013-08-09T18:09:32Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"The option \"--diff3\" was added to \"git merge-file\" in e0af48e\n(xdiff-merge: optionally show conflicts in \"diff3 -m\" style)\nbut it was never documented in \"Documentation/git-merge-file.txt\".\nAdd documentation for this option.\n\nSigned-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n---\n Documentation/git-merge-file.txt | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt\nindex d7db2a3..d2fc12e 100644\n--- a/Documentation/git-merge-file.txt\n+++ b/Documentation/git-merge-file.txt\n@@ -11,7 +11,7 @@ SYNOPSIS\n [verse]\n 'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]\n \t[--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]\n-\t<current-file> <base-file> <other-file>\n+\t[--[no-]diff3] <current-file> <base-file> <other-file>\n \n \n DESCRIPTION\n@@ -66,6 +66,9 @@ OPTIONS\n -q::\n \tQuiet; do not warn about conflicts.\n \n+--diff3::\n+\tShow conflicts in \"diff3\" style.\n+\n --ours::\n --theirs::\n --union::\n-- \n1.8.4.rc1.29.g4402f30\n"}]}