Mercurial > emacs
view move-if-change @ 87739:28dc34f6a246
* vc.el (vc-update): Resolve conflicts if necessary instead of
just updating the buffer.
* vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the
update command so that we can parse the output.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 13 Jan 2008 20:03:35 +0000 |
| parents | 354e0c45cedf |
| children | 14a97ab281d5 |
line wrap: on
line source
#!/bin/sh if test -r $2 then if cmp $1 $2 > /dev/null then echo $2 is unchanged rm -f $1 else mv -f $1 $2 fi else mv -f $1 $2 fi