]> git.lyx.org Git - lyx.git/commit
projects / lyx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 85c4cd2) | patch
Fix broken merge
authorGeorg Baum <baum@lyx.org>
Sat, 28 Nov 2015 18:23:48 +0000 (19:23 +0100)
committerGeorg Baum <baum@lyx.org>
Sat, 28 Nov 2015 18:25:32 +0000 (19:25 +0100)
commit1ded0d77ada82eb3be61749e273da6cbf58597bf
tree212875fe0d6e120ae89f2c0ae7c4b89dd431e306tree | snapshot
parent85c4cd2714b30ae752931023845e4aca6f58f501commit | diff
Fix broken merge

git should have refused to push my commit which changed a file that was
deleted a minute ago, but instead it decided to re-add the file.
development/autotests/revertedTests [deleted file] blob | history
The LyX Source Repository