{"thread":{"id":"2393","subject":"Re: Expected Behavior?","startedAt":"2005-11-08T03:07:13Z","lastAt":"2005-11-08T03:07:13Z","messageCount":1,"participants":["Jon Loeliger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"11298","messageId":"E1EZJpJ-0002S6-8S@jdl.com","threadId":"2393","inReplyTo":null,"subject":"Re: Expected Behavior?","fromName":"Jon Loeliger","fromEmail":"jdl@freescale.com","sentAt":"2005-11-08T03:07:13Z","receivedAt":"2005-11-08T03:07:13Z","isPatch":false,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"\n> It appears that as the everyday workhorse, using Daniel's\n> git-merge-resolve is stable through git-merge have proven stable\n> enough.  So here is a question.  Do people mind if 'git-resolve'\n> and 'git-octopus' are dropped before 1.0?  This means 2 less\n> programs in your /usr/bin ;-).\n\nIt's OK with me. :-)\n\njdl\n"}]}