projects
/
vimb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
383e698
aeed2b0
)
Merge branch 'new-key-handling'
author
Daniel Carl
<danielcarl@gmx.de>
Sun, 20 Oct 2013 12:25:31 +0000
(14:25 +0200)
committer
Daniel Carl
<danielcarl@gmx.de>
Sun, 20 Oct 2013 12:25:31 +0000
(14:25 +0200)
Conflicts:
src/command.c
src/main.c
1
2
config.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
config.mk
Simple merge
projects / vimb.git / commitdiff