{"thread":{"id":"18599","subject":"[Announce] teamgit v0.0.10 - visual mergetool","startedAt":"2009-03-28T09:53:33Z","lastAt":"2009-03-28T09:53:33Z","messageCount":1,"participants":["Abhijit Bhopatkar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"109696","messageId":"1238234013.24658.4.camel@bain-laptop","threadId":"18599","inReplyTo":null,"subject":"[Announce] teamgit v0.0.10 - visual mergetool","fromName":"Abhijit Bhopatkar","fromEmail":"bain@devslashzero.com","sentAt":"2009-03-28T09:53:33Z","receivedAt":"2009-03-28T09:53:33Z","isPatch":false,"sender":{"key":"bain@devslashzero.com","avatar":"https://gravatar.com/avatar/3f9bfde580be8d4de9df5a129387d9069d43eb1a65d745c583de9dfe9d97ebc8?d=mp&s=160"},"body":"Hi people,\nteamGit is a functional git gui written in qt, its ultimate aim is to\nadd functionality on top of git targeted at small closely knit teams.\n\nI have tagged the repo with v0.0.10!!!\nYou can now get the .deb from ubuntu intrepid ppa\ndeb http://ppa.launchpad.net/bain-devslashzero/ubuntu intrepid main\npackage name is teamgit.\nThe main project website is http://www.devslashzero.com/teamgit\n\nChanges from v0.0.9 include a visual interactive merge conflict\nresolution.\n\nChangelog from v0.0.9 follows\nAbhijit Bhopatkar (32):\n      Revert \"Check, whether valid data is parseable or not\"\n      guifycommanddialogimpl.cpp: Avoid crashing for unparsable man\npages\n      gitprocess: whitespace cleanup\n      Add slot to check for merge conflicts\n      Add merge conflict label\n      Add merge conflict checking in refresh\n      settings_ui: Add mergetool path text box and select button\n      Move git specific settings from mainwindow to settings for easier\nmanagement\n      Add merge tool path setting\n      Add mergetool selction and fix writing it to settings file\n      whitespace fixes\n      Fix merge conflict label\n      Merge branch 'master' of git://gitorious.org/teamgit/mainline\n      Show files with merge conflicts only once\n      Move GIT_INVOKE from mainwindowsimpl to gitthread\n      Added merge dialog ui file\n      Added merge dialog implementation\n      Added merge dialog file to the qmake project\n      Execute merge dialog when merge conflict label is clicked\n      Connect filediff signal from git thread to mergedialog\n      Show conflicting files in the merge dialog\n      Added slot for getting merge conflict file's contents\n      Gather conflicting file contents for unmerged files\n      Disable merge tool options group box\n      Fix: Clear previous contents in merge dialog on init\n      gitprocess: append the filename to the conflict contents signal\n      Disable the mergetool settings\n      mergedialog: execute meld to resolve merge conflict\n      Set commit message in commit dialog if COMMIT_EDITMSG exists\n      diffviewer: Move font setting from mainwindowimpl to diffviewer\n      User .git/MERGE_MSG instead of COMMIT_EDITMSG\n      Fix merege conflict message while commiting\n\nTerje Rosten (1):\n      fixing .desktop file\n"}]}