Mercurial Mercurial > skel / comparison
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.
.gitconfig
changeset 973 277ccd286936
parent 944 abefcbeca9a5
child 996 17158fb949a8
equal deleted inserted replaced
972:27754771cbb6 973:277ccd286936 
    57 default = simple
 
    57 default = simple
 
    58 
    58 
    59 [pull]
 
    59 [pull]
 
    60 ff = only
 
    60 ff = only
 
    61 
    61 
       
    62 [rerere]
 
       
    63 # Reuse Recorded Resolution. Keeps database of manually resolved conflicts.
 
       
    64 enabled = true
skel