]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3202d1 52ad961)
Merge branch 'detached-head'
authorRichard Millet <remillet@berkeley.edu>
Fri, 17 Feb 2012 23:51:17 +0000 (15:51 -0800)
committerRichard Millet <remillet@berkeley.edu>
Fri, 17 Feb 2012 23:51:17 +0000 (15:51 -0800)
Conflicts:
README.txt

1  2 
README.txt patch | diff1 | diff2 | blob | history

diff --cc README.txt
index 14176e9f23340d308d282cbaebdd72aa37f29b6f,320be9edc9b42fc303641538a699e932502873f6..2d7ef5e5e864ec28e3c116b8d448fb43a8224a77
--- 1/README.txt
--- 2/README.txt
+++ b/README.txt
@@@ -28,4 -28,5 +28,6 @@@ Make 
  Make 6
  
  Make 7
+ 
 +Make 8
+ Make 9 in detached head again.