{"thread":{"id":"44562","subject":"[PATCH 2/2] mergetools/vimdiff: trust Vim's exit code","startedAt":"2016-11-29T09:39:39Z","lastAt":"2016-11-29T09:39:39Z","messageCount":1,"participants":["David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"306536","messageId":"20161129093820.24722-1-davvid@gmail.com","threadId":"44562","inReplyTo":null,"subject":"[PATCH 2/2] mergetools/vimdiff: trust Vim's exit code","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2016-11-29T09:38:20Z","receivedAt":"2016-11-29T09:39:39Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Allow vimdiff users to signal that they do not want to use the\nresult of a merge by exiting with \":cquit\", which tells Vim to\nexit with an error code.\n\nThis is better than the current behavior because it allows users\nto directly flag that the merge is bad, using a standard Vim\nfeature, rather than relying on a timestamp heuristic that is\nunforgiving to users that save in-progress merge files.\n\nThe original behavior can be restored by configuring\nmergetool.vimdiff.trustExitCode to false.\n\nReported-by: Dun Peal <dunpealer@gmail.com>\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\nI've included anyone that has ever touched the vimdiff feature on the Cc:\nlist since I'm assuming that you use vimdiff.\n\nThis change is a slight change in default behavior when using\nmergetool with vimdiff, but I think it's a better default overall.\n\n mergetools/vimdiff | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/mergetools/vimdiff b/mergetools/vimdiff\nindex a841ffdb4..10d86f3e1 100644\n--- a/mergetools/vimdiff\n+++ b/mergetools/vimdiff\n@@ -42,3 +42,7 @@ translate_merge_tool_path() {\n \t\t;;\n \tesac\n }\n+\n+exit_code_trustable () {\n+\ttrue\n+}\n-- \n2.11.0.rc3.6.g2e567fd\n\n"}]}