Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 27040:1bde66b89bb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -2 tip
age author description
Fri, 13 Nov 2015 23:58:05 -0800 Siddharth Agarwal filemerge._mergecheck: add check for change/delete conflicts
Sun, 15 Nov 2015 21:40:15 -0800 Siddharth Agarwal filemerge._picktool: only pick from nomerge tools for change/delete conflicts
less more | (0) -100 -30 -10 -2 tip