tests/test-issue619.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Sat, 13 Jun 2009 18:14:50 +0200
changeset 8790 72af80052bd9
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
inotify: add log config option redirect inotify server output to a file

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: can't merge with ancestor
done