chiark / gitweb /
Fix contrib/stg-whatchanged way of identifying a conflict.
authorYann Dirson <ydirson@altern.org>
Mon, 25 Jun 2007 21:24:26 +0000 (23:24 +0200)
committerCatalin Marinas <catalin.marinas@gmail.com>
Mon, 25 Jun 2007 21:45:32 +0000 (22:45 +0100)
commit3fca69b2cdcc288e96f335bbd7ecdc8bc6912749
tree8fa47d0c2c95f73173729e06a68d4a0cfeaf67c2
parentf21ba53677d2e5820f2dc1774871bf8464729eea
Fix contrib/stg-whatchanged way of identifying a conflict.

Signed-off-by: Yann Dirson <ydirson@altern.org>
contrib/stg-whatchanged