[diff.git] context = 10 [merge-tools.diffconflicts] program = "nvim" merge-args = ["-c", "JJDiffConflicts!", "$output"] merge-tool-edits-conflict-markers = true [revset-aliases] "immutable_heads()" = "present(trunk()) | tags() | (trunk().. & ~mine())" [signing] sign-all = false backend = "gpg" key = "6F6A0609C12038F3" [ui] default-command = ["log", "-r", "all()", "--limit", "15"] diff.format = "git" diff.tool = ["difft", "--color=always", "$left", "$right"] editor = "nvim" [user] name = "Sanchayan Maity" email = "me@sanchayanmaity.net"