Mercurial > hg > mercurial-crew-with-dirclash
comparison templates/filerevision.tmpl @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 2ee819a950aa |
children | 5d5ab159d197 5197fb9d65d5 4f81068ed8cd |
comparison
equal
deleted
inserted
replaced
767:61ed30e82b27 | 768:20e95c245bc3 |
---|