projects
/
skytools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e61ea5
a3dd719
)
Merge pull request #15 from askoja/master
author
Marko Kreen
<markokr@gmail.com>
Thu, 18 Oct 2012 12:19:03 +0000
(
05:19
-0700)
committer
Marko Kreen
<markokr@gmail.com>
Thu, 18 Oct 2012 12:19:03 +0000
(
05:19
-0700)
Two more merge related tests
Trivial merge