projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2064046
)
Merger.js
author
Alan Knowles
<alan@akbkhome.com>
Sun, 11 Sep 2011 23:04:48 +0000
(07:04 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Sun, 11 Sep 2011 23:04:48 +0000
(07:04 +0800)
Merger.js
patch
|
blob
|
history
diff --git
a/Merger.js
b/Merger.js
index
85940d8
..
ef4e212
100644
(file)
--- a/
Merger.js
+++ b/
Merger.js
@@
-398,7
+398,7
@@
Merger=new XObject({
},
{
xtype: Gtk.Button,
- label : "Commit diff (
no merge
)"
+ label : "Commit diff (
merge after
)"
}
]
},