chiark
/
gitweb
/
~mdw
/
profile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4abf307
59c9c0e
)
Merge remote-tracking branch 'crybaby'
author
Mark Wooding
<mdw@distorted.org.uk>
Sun, 15 May 2011 11:35:09 +0000
(12:35 +0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Sun, 15 May 2011 11:35:09 +0000
(12:35 +0100)
* crybaby:
dot/bash*: Reformat.
mc: Store configuration and arrange for linkage.
1
2
dot/bash_profile
patch
|
diff1
|
diff2
|
blob
|
history
setup
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dot/bash_profile
Simple merge
diff --cc
setup
Simple merge