--- a/autoload/threesomelib/modes.py Tue Jun 28 17:48:57 2011 -0400
+++ b/autoload/threesomelib/modes.py Tue Jun 28 18:29:43 2011 -0400
@@ -139,8 +139,8 @@
diagram = pad(self.hud_diagram())
commands = pad([
r'Threesome Commands',
- r'd: cycle diffs n: next conflict space: cycle layouts',
- r'D: diffs off N: prev conflict s: toggle scrollbind',
+ r'd: cycle diffs n: next conflict space: cycle layouts u: use hunk o: original 1: one q: save and quit',
+ r'D: diffs off N: prev conflict s: toggle scrollbind r: result 2: two CC: exit with error',
])
lines = []