Mercurial > hg
comparison Makefile @ 5700:9cedc3fbbebb
merge: simplify merge tests, fix exec flag bug
If local changed exec bit and remote changed file contents, exec bit
change would be lost.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 27 Dec 2007 22:27:37 -0600 |
parents | 3fd4dde37628 |
children | 02e358a3a8a7 |
comparison
equal
deleted
inserted
replaced
5699:4cf5a4950fc9 | 5700:9cedc3fbbebb |
---|