projects / selector.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29247fe 38e62ee)
Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector
authorFrancois Fleuret <francois@fleuret.org>
Wed, 15 Apr 2009 07:40:16 +0000 (09:40 +0200)
committerFrancois Fleuret <francois@fleuret.org>
Wed, 15 Apr 2009 07:40:16 +0000 (09:40 +0200)
Conflicts:
REVISION_NUMBER

1  2 
REVISION_NUMBER patch | diff1 | diff2 | blob | history

diff --cc REVISION_NUMBER
index fba7ed5,aaacbe6..87f6629
--- 1/REVISION_NUMBER
--- 2/REVISION_NUMBER
+++ b/REVISION_NUMBER
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD:REVISION_NUMBER
 +143
++=======
+ 142
++>>>>>>> 38e62ee50d9f4b6f77a34f6841a2db635e2553df:REVISION_NUMBER
A real-time interactive pattern matcher in console.