projects / selector.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 29247fe)
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

REVISION_NUMBER patch | blob | history

diff --git a/REVISION_NUMBER b/REVISION_NUMBER
index fba7ed5..87f6629 100644 (file)
--- a/REVISION_NUMBER
+++ b/REVISION_NUMBER
@@ -1 +1,5 @@
+<<<<<<< HEAD:REVISION_NUMBER
 143
+=======
+142
+>>>>>>> 38e62ee50d9f4b6f77a34f6841a2db635e2553df:REVISION_NUMBER
A real-time interactive pattern matcher in console.