0
@@ -1,4 +1,7 @@
0
-[2008-03-08] 
0
+Release 1.1.1 [2008-03-10]
0
+ - Bugfix - merge command was breaking when trying to show links to conflicted files
0
+
0
+Release 1.1.0 [2008-03-08]
0
  - Huge refactoring effort - built a mini-mvc framework to meet the specific needs of the bundle, and ported all existing code to it.
0
  - Fixed compatibility issues with Git 1.5.4.3. 
0
  - Log commands lazy-load their diffs now
0
@@ -7,7 +10,6 @@
0
  - Git shortcut keys for svn commands were conflicting with existing textmate commands.  Updated to Command-Option-G
0
  - A few UI-enhancements
0
  
0
- 
0
 [2008-02-20] Commit dialog graceful handling of conflict resolutions
0
 
0
 [2008-02-20] Commit dialog limits down to the selected file/folder selected in drawer.

0
@@ -1,5 +1,5 @@
0
 The Git Textmate Bundle.
0
-Version 1.1
0
+Version 1.1.1
0
 
0
 <h2>Installation</h2>
0
 

0
@@ -88,7 +88,7 @@ class BranchController < ApplicationController
0
     unless result[:conflicts].empty?
0
       puts "<h2>Conflicts - edit each of the following, resolve, commit, then merge again:</h2>"
0
       result[:conflicts].each do |conflicted_file|
0
-        full_path = File.join(@base, conflicted_file)
0
+        full_path = File.join(git.git_base, conflicted_file)
0
         tm_open(full_path)
0
         puts "<div><a href='txmt://open?url=file://#{e_url full_path}'>#{conflicted_file}</a></div>"
0
       end