projects
/
swc-modular-shell-dictionary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6af7758
d8c9a25
)
Merge branch 'master' into namespaced
author
W. Trevor King
<wking@tremily.us>
Tue, 29 Oct 2013 22:58:56 +0000
(15:58 -0700)
committer
W. Trevor King
<wking@tremily.us>
Tue, 29 Oct 2013 22:59:50 +0000
(15:59 -0700)
This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch. After this merge, future
merges from the master branch will pick up any content changes.
$ git merge --log --no-ff --strategy ours master
* master:
dictionary.txt: Remove nesting 1-Shell/
Trivial merge
projects / swc-modular-shell-dictionary.git / commitdiff