artulab
projects / openbsd / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1d91150) | patch
Do not put the file into conflict if it is no longer modified (user has
authornicm <nicm@openbsd.org>
Tue, 13 Jul 2010 20:47:19 +0000 (20:47 +0000)
committernicm <nicm@openbsd.org>
Tue, 13 Jul 2010 20:47:19 +0000 (20:47 +0000)
commit50b68c3e7e3ba045abd01917b1efdcc52efebb29
tree06a765c3b4a4253c7cfdf76e78b21b6b4cc610e7tree | snapshot
parent1d911502078a1e7558f4eeb2b2c339889d0e8ac3commit | diff
Do not put the file into conflict if it is no longer modified (user has
edited it back to repository state).

ok zinovik
usr.bin/cvs/file.c diff | blob | history
OpenBSD src
by Ahmet Artu Yildirim