chiark
/
gitweb
/
~mdw
/
profile
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ae7460d
ac4ae7c
)
Merge branch 'master' of metalzone:etc/profile
author
Mark Wooding
<mdw@distorted.org.uk>
Sat, 26 Dec 2009 11:26:37 +0000
(11:26 +0000)
committer
Mark Wooding
<mdw@distorted.org.uk>
Sat, 26 Dec 2009 11:26:37 +0000
(11:26 +0000)
* 'master' of metalzone:etc/profile:
dot/emacs, el/dot-emacs.el: Fix patterns for root prompt.
1
2
dot/emacs
patch
|
diff1
|
diff2
|
blob
|
history
el/dot-emacs.el
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dot/emacs
Simple merge
diff --cc
el/dot-emacs.el
Simple merge