Mercurial
Mercurial
>
hg
/ file revision
summary
|
shortlog
|
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
files
|
changeset
| file |
latest
|
revisions
|
annotate
|
diff
|
comparison
|
raw
|
help
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
tests/binfile.bin
author
Siddharth Agarwal <sid0@fb.com>
Fri, 13 Nov 2015 23:58:05 -0800
changeset 27040
1bde66b89bb2
parent 3368
751df21dad72
permissions
-rw-r--r--
filemerge._mergecheck: add check for change/delete conflicts Merge tools that perform an actual 3-way merge can't handle change/delete conflicts. This adds a check for that.
(binary:application/octet-stream)